am f87bc344: (-s ours) am 802c6fd0: am ff52e23f: Merge "Stop being silly."

* commit 'f87bc34412dc11ee59319cd5aba7b34d14f51b85':
This commit is contained in:
Elliott Hughes 2015-08-27 11:51:20 +00:00 committed by Android Git Automerger
commit 7a94a2e639

Diff content is not available