Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:09:26 +0000 (17:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:09:26 +0000 (17:09 +0000)
commit9eb945b2c35646fb50ea7f5a3f0ba2fc3d5e0e15
tree93fd9d1022ac523f01b40c1a51fc4f9bf6a6a74d
parent03b5035568b718cc694c8483e589cb7efd92e368
parentfad5a803ae114ca67758d07503dd99a31fc55aea
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f am: 91a977c1d3
am: fad5a803ae

Change-Id: Ibfd51487f4238a90227e29c2d37a9b87c499f8bf