Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f
authorTina Zhou <tinazh@google.com>
Wed, 21 Dec 2016 23:07:17 +0000 (23:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Dec 2016 23:07:17 +0000 (23:07 +0000)
commit4045968a8edd134f013088c79a96a4e5faab2dcf
tree89e302b029277a181ec88ea41ded558cf0c894a0
parenta03e8e8556a7255e9f6206c2c4730be42b199960
parentb44fae0a8a0d818fe0c9653e663802a3aff45561
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f
am: b44fae0a8a

Change-Id: I4dd81db0bf1123030a372f72dacc1f09ec695272