Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:03:39 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:03:39 +0000 (18:03 +0000)
commit3b9836506340684372791218d846c7bb687e013f
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parentfe55de4ec7a242aa7a5ae065b4771c7b9686a952
parent56f5dd22e487c2941970d61b3a6d22c837bdbc92
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f am: 91a977c1d3 am: fad5a803ae am: 9eb945b2c3
am: 56f5dd22e4

Change-Id: I8ed5d9ec1c12aae37b48fab47211a20b4b09b71c