Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
authorXin Li <delphij@google.com>
Thu, 26 Jan 2017 20:34:22 +0000 (20:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 20:34:22 +0000 (20:34 +0000)
commit1f9853e0068c9dfc17a37ff7d95b1048cc6853e3
tree4683f4cc440ad2be9e7a58569ecd40a913f5b266
parent225e1e1eb7b1ddfbb6a0253d4bc13fb4b85b7a83
parent04974c3449624fc46f06d145cfbc84783ac58342
Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to 
am: 04974c3449

Change-Id: Idd92a7eeffaa2a6aec507dc3c886a6f08eea47be