Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
authorXin Li <delphij@google.com>
Thu, 26 Jan 2017 20:46:52 +0000 (20:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 20:46:52 +0000 (20:46 +0000)
commite7d7588724a12948a360ab69f9c965e77e29409b
tree8c2b214f1ad9f62dd7bc3c32ae8b19f2f4980550
parent3127c5bc957e782e8c23ec40ec32b00eba57594a
parent045eb76c67c46a3dda00f07ae736537975468667
Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to  am: 04974c3449 am: 1f9853e006 am: e9a25e7e34
am: 045eb76c67

Change-Id: I8f0e89b2b3cd4e75425be560e5ed578a80817119