Merge nougat-mr1-cts-dev into master. am: 2dcacdbe0a am: b196334de5
authorXin Li <delphij@google.com>
Thu, 26 Jan 2017 21:15:27 +0000 (21:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 21:15:27 +0000 (21:15 +0000)
commit03c2353df4062ac5f51fad5fac234e15a605e55f
tree4683f4cc440ad2be9e7a58569ecd40a913f5b266
parente9b300de338d477dc04f1ed2139dccc323dc3ace
parent769492af1d4711ecfc6d72a4d9a721f4ffe73c6e
Merge nougat-mr1-cts-dev into  am: 2dcacdbe0a am: b196334de5
am: 769492af1d

Change-Id: Ic9c6eec0b2d1cee2c2efa20531720eb6fb77745b