OSDN Git Service

Merge changes Ie43bcbcd,Ia9901a83 into nyc-mr1-dev am: 762dc30ad5 am: 30cb846c33
authorAndrew Solovay <asolovay@google.com>
Fri, 29 Jul 2016 01:50:18 +0000 (01:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Jul 2016 01:50:18 +0000 (01:50 +0000)
commit8804ec228f5e50d490d6d7f80d216bf2a6ed2884
tree1d33a6fed32899db02d4ee274b67a5813046bc40
parentdaae4594ed8e8433852b3a42688f62028b73085d
parentd6e64b364ad63756d5fa22a2901586acac5d8b35
Merge changes Ie43bcbcd,Ia9901a83 into nyc-mr1-dev am: 762dc30ad5 am: 30cb846c33
am: d6e64b364a

Change-Id: Ie615397927ce2f13e98bdb952ada90407c073299