Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
authorTina Zhou <tinazh@google.com>
Wed, 21 Dec 2016 23:34:53 +0000 (23:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Dec 2016 23:34:53 +0000 (23:34 +0000)
commitffc44cfca70e66bb659c537b2f730d3823513a0c
treee89e6dbf906ddf9de34006edd897c7c6debd73ef
parent3ae98f7a993b327a884e467156a1fd7be814fdfe
parent6a64e395a544140b6b6811c3630351e9222f1aa7
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: b44fae0a8a am: 4045968a8e am: d1e1ca812f
am: 6a64e395a5

Change-Id: I0de981e47bba7261d547af21da577705a243380d