OSDN Git Service

Merge changes I25d9ac3e,I783dac75 am: 83eab26cf2
authorMathieu Chartier <mathieuc@google.com>
Fri, 17 Jun 2016 18:52:26 +0000 (18:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 18:52:26 +0000 (18:52 +0000)
commit960ee5c5866fc74ca08e3b2508f133ace0b62ac2
tree1dbc3d3d23905abb098535cbf0a4986ad696d817
parente53e63f5731c514b3a32c63373e2e5081e0795be
parentfcfcd1e5635fe052f9641f586ed93b5f6f011dfb
Merge changes I25d9ac3e,I783dac75 am: 83eab26cf2
am: fcfcd1e563

Change-Id: Ibf6ff3ae9517888e7832325b108393bfa31d5245