Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
authorTina Zhou <tinazh@google.com>
Thu, 22 Dec 2016 02:40:00 +0000 (02:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 02:40:00 +0000 (02:40 +0000)
am: c54f821620

Change-Id: I509c19856489116ab17e0b7848f9b2ffebc0e3ba


Trivial merge