OSDN Git Service

Merge changes I5b05e23a,I9350b250,I1d66b42a am: 393a1fd02f
authorAlex Light <allight@google.com>
Sat, 15 Apr 2017 02:31:44 +0000 (02:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 15 Apr 2017 02:31:44 +0000 (02:31 +0000)
am: c622290608

Change-Id: Iaa537fab4e4aebd274276975c86a27149df2fca2


Trivial merge