Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
authorTina Zhou <tinazh@google.com>
Wed, 21 Dec 2016 23:25:28 +0000 (23:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Dec 2016 23:25:28 +0000 (23:25 +0000)
commit6a64e395a544140b6b6811c3630351e9222f1aa7
treee89e6dbf906ddf9de34006edd897c7c6debd73ef
parente4e623db595ea9a58766693f862a427cafa9a2a7
parentd1e1ca812ff2ffe9263ab4b36075c131374e8d2f
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: b44fae0a8a am: 4045968a8e
am: d1e1ca812f

Change-Id: I34f00e32575cbf482fd192b16368789a9fb80081