Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
authorTina Zhou <tinazh@google.com>
Thu, 22 Dec 2016 02:45:53 +0000 (02:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 02:45:53 +0000 (02:45 +0000)
commitffe9309ee06ba071990f50d0681ec74d39628ee6
treeb4c34f861284c67e866ea1ec863c733b192c6aed
parent6eb7357e9ba0ca5af2160e2b0d93c5b6eb3e0205
parent39f956ac2868d8011ad3c33bd25953b5583af42f
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: b44fae0a8a am: 4045968a8e am: d1e1ca812f am: 6a64e395a5 am: c54f821620
am: 39f956ac28

Change-Id: Ie21d50116ab96ac30408237503dd0829f634509d