OSDN Git Service

DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09 -s ours am...
authorRobert Shih <robertshih@google.com>
Thu, 14 Jul 2016 23:11:32 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 23:11:32 +0000 (23:11 +0000)
am: cd349da1c2

Change-Id: I0bbf7d30e9f37cf6cb3f2a73d790b079c0bf837b


Trivial merge