OSDN Git Service

Merge changes I7c418811,I0870eae0
authorRoshan Pius <rpius@google.com>
Tue, 22 Nov 2016 01:39:03 +0000 (01:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Nov 2016 01:39:03 +0000 (01:39 +0000)
commitdf6cb83d978c91a6bd71733145c7a0205fdde9bd
treeef78d482fba59cab1837099265623c3c65a8d918
parentdb91ca1794785a53fcc92b9bb46eae94ca52a7e1
parent88fb149b8eb54feeaabd015c577088c806dc200d
Merge changes I7c418811,I0870eae0
am: 88fb149b8e

Change-Id: Ic1b7ccb20296344bb551fc600d3d6e25fe1fe6a6