Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:05:47 +0000 (18:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:05:47 +0000 (18:05 +0000)
commite3d06ac287a501284a629326a5cd4b6a755c3185
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parent9b5212c12de54f8c635969ef0ecc2adafa10786a
parenta1d816d27c901a9b990b6b484c47979ff77652f9
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f am: 636d5cdf56
am: a1d816d27c

Change-Id: Ib37b60a82d0303916562e1ab909b9084180943c4