Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
authorTina Zhou <tinazh@google.com>
Thu, 22 Dec 2016 02:50:59 +0000 (02:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 02:50:59 +0000 (02:50 +0000)
commit6ac7ba534dc6964f5ae3544be746c2bea0db1bac
tree0e14c97066979920883b90d2fab58dd3ccf75a05
parente43f97f3e16555672a95c7253e67093e2e626838
parent4fedaa18d039dae2534f5d3e9d7cdeddeeb0c0f2
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: b44fae0a8a am: 4045968a8e am: d1e1ca812f am: 6a64e395a5 am: ffc44cfca7
am: 4fedaa18d0

Change-Id: I3c51fdf7be0bd5b9c0de6d54d65b6776661e5e9e