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

Change-Id: I4d80ab4fe02c0c7209365b08bf64358f6f7979e8