am 8fd6c3d7: (-s ours) Stop being silly. am: 41732a3223
authorElliott Hughes <enh@google.com>
Mon, 11 Jan 2016 19:49:55 +0000 (19:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:49:55 +0000 (19:49 +0000)
am: ba4a476d12

* commit 'ba4a476d12f186dbf0776a333ba66213646663ec':


Trivial merge