Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:12:03 +0000 (17:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:12:03 +0000 (17:12 +0000)
commit56f5dd22e487c2941970d61b3a6d22c837bdbc92
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parent6b074dd8e6360b36d7d20f50327a6fd07bf81f90
parent9eb945b2c35646fb50ea7f5a3f0ba2fc3d5e0e15
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f am: 91a977c1d3 am: fad5a803ae
am: 9eb945b2c3

Change-Id: I7ee71b88a41508adf514de850ea9237d26f77061