OSDN Git Service

Merge changes I852b4daf,Id648eaed
authorAlex Light <allight@google.com>
Fri, 12 Aug 2016 17:42:32 +0000 (17:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 17:42:32 +0000 (17:42 +0000)
am: 346285b558

Change-Id: Id1c7bc956e0c64620a030edd72a3a8bb3831a712


Trivial merge