Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
authorXin Li <delphij@google.com>
Thu, 26 Jan 2017 20:34:22 +0000 (20:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 20:34:22 +0000 (20:34 +0000)
am: 04974c3449

Change-Id: Idd92a7eeffaa2a6aec507dc3c886a6f08eea47be


Trivial merge