Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:05:14 +0000 (17:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:05:14 +0000 (17:05 +0000)
commitfad5a803ae114ca67758d07503dd99a31fc55aea
tree93fd9d1022ac523f01b40c1a51fc4f9bf6a6a74d
parent19ac07e772f9b66459ff9da766fed9eae02a9484
parent91a977c1d3c3ed78559e4f33b91ec9eeae223c8f
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f
am: 91a977c1d3

Change-Id: I66df11cc48ca8bda0a0f828bc39a8ed364511976