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

Change-Id: Ib75bb206d5423e89bf53b3011ab918ec41f8046b


Trivial merge