OSDN Git Service

Merge changes I4d8da7ce,I4da5be01,Idfbead82
authorRoland Levillain <rpl@google.com>
Fri, 24 Jun 2016 13:12:47 +0000 (13:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 13:12:47 +0000 (13:12 +0000)
am: 31167a5785

Change-Id: Id0131ff628a47b611e39c026243cf5f11ce9bc49


Trivial merge