Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Wed, 21 Dec 2016 22:47:32 +0000 (22:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Dec 2016 22:47:32 +0000 (22:47 +0000)
commitb44fae0a8a0d818fe0c9653e663802a3aff45561
tree89e302b029277a181ec88ea41ded558cf0c894a0
parent62137a913c58335d718bc0ffd14dec7cff64ae56
parent4812d6d47fee76e8fafc886a9876d9ea935a7995
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev
am: 4812d6d47f

Change-Id: I008b5f61e4e68e6783cffd2d2fe5cc11fc10e814