Merge nougat-mr1-cts-dev into master. am: 2dcacdbe0a
authorXin Li <delphij@google.com>
Thu, 26 Jan 2017 21:12:27 +0000 (21:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 21:12:27 +0000 (21:12 +0000)
commit769492af1d4711ecfc6d72a4d9a721f4ffe73c6e
tree4683f4cc440ad2be9e7a58569ecd40a913f5b266
parent4f65cf0bba5fb7bc12d5ef761fe58c52e9f4628f
parentb196334de5ee93d0a2e8eec0bf1ac868364038ae
Merge nougat-mr1-cts-dev into  am: 2dcacdbe0a
am: b196334de5

Change-Id: I28d200d6322de752529169cc1960379774f4fd7f