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)
commitf7511ac4974ac8348c9c8d606019cf15bf5571a6
tree4638474468cbdb7aef26fdf6b1942f921869b73e
parenta5364b014b7920ffb95b4bbdcaa2c5de59ee2718
parent31167a5785f7a5124de96535066db9890559f546
Merge changes I4d8da7ce,I4da5be01,Idfbead82
am: 31167a5785

Change-Id: Id0131ff628a47b611e39c026243cf5f11ce9bc49