Stop being silly. am: ded9c531f5 am: ca5484989b
authorElliott Hughes <enh@google.com>
Mon, 11 Jan 2016 19:47:25 +0000 (19:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:47:25 +0000 (19:47 +0000)
am: 63f2b6ef09

* commit '63f2b6ef09760ce604bb4d9e6e074b4d89a42fc7':


Trivial merge