OSDN Git Service

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

Change-Id: Ie8c4b4df445063c09bfaf9a1e987798c6d1df978


Trivial merge