Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
authorXin Li <delphij@google.com>
Tue, 22 Aug 2017 20:48:29 +0000 (20:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:48:29 +0000 (20:48 +0000)
commit73848c0fdee9099ad0bdaa75f4350588acc8246c
treef83c4ae88105474ccba79791513065abe1ff2c93
parent0e247f6af1a7858f98814397328d08886566c90e
parente7d7588724a12948a360ab69f9c965e77e29409b
Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to  am: 04974c3449 am: 1f9853e006 am: e9a25e7e34 am: 045eb76c67
am: e7d7588724

Change-Id: I41ece2970c2b3411b915634be2f58f7330d3ffd2