Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:06:08 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:06:08 +0000 (18:06 +0000)
commite0f225fd2571e35b3569e6c66129e6f39e0579a7
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parent50821dcd648bd079302c5d5dcb14f22f2738eb88
parente3d06ac287a501284a629326a5cd4b6a755c3185
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f am: 636d5cdf56 am: a1d816d27c
am: e3d06ac287

Change-Id: I830179c5f8a5cb57b28fcfd27f09fb5b6b522352