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

Change-Id: I17f55595d2971b1fc98cda86a96d8bba4880dcc1