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)
am: b196334de5

Change-Id: I28d200d6322de752529169cc1960379774f4fd7f


Trivial merge