Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:12:25 +0000 (17:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:12:25 +0000 (17:12 +0000)
commita1d816d27c901a9b990b6b484c47979ff77652f9
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parentb7ebfc3c106c735dd47cec174e34a8609ec6e47f
parent636d5cdf5680ea34f7a05089f320abec1ba573c8
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f
am: 636d5cdf56

Change-Id: I4c2a49e924b8423bb01553e6127689bbfda26fdd