Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:04:24 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:04:24 +0000 (18:04 +0000)
commite5ac8444f71e0f763aa6cb01ab4de83a99325a8b
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parent9333d8e6c3422528701a04f313e9d77be4df2887
parent3b9836506340684372791218d846c7bb687e013f
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f am: 91a977c1d3 am: fad5a803ae am: 9eb945b2c3 am: 56f5dd22e4
am: 3b98365063

Change-Id: Ic9543265c1777380b344b7a9585dbb1ba07ec343