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

Change-Id: I17f55595d2971b1fc98cda86a96d8bba4880dcc1


Trivial merge