Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
authorXin Li <delphij@google.com>
Thu, 26 Jan 2017 20:40:20 +0000 (20:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 20:40:20 +0000 (20:40 +0000)
commit045eb76c67c46a3dda00f07ae736537975468667
tree4683f4cc440ad2be9e7a58569ecd40a913f5b266
parent1969316fda3832a95b32b10d11f189ef98533483
parente9a25e7e3468df6a23f32b86e607f1767ee86f36
Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to  am: 04974c3449 am: 1f9853e006
am: e9a25e7e34

Change-Id: Ib75bb206d5423e89bf53b3011ab918ec41f8046b