Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:22:02 +0000 (18:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:22:02 +0000 (18:22 +0000)
commitf060f2dee39fb88a0d0bc6f360a868f8c97bebcb
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parente8744baa0b33aaf3afd9c8738be49b243cbed951
parent77336cdec106e3e70e03210f2368b0a8b22bb15e
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887 am: 193118e5b6 am: e6b4e15512 am: 3830218b68
am: 77336cdec1

Change-Id: I6095be19548b9fe0b9a77ed01a6f6e173d9fe63d