OSDN Git Service

merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 96c347a9b9 am: 627cc3afb3
authorAlex Light <allight@google.com>
Fri, 16 Dec 2016 22:37:45 +0000 (22:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Dec 2016 22:37:45 +0000 (22:37 +0000)
am: c51d68746c

Change-Id: I28727204b16e0cb6c45a2ab3305fb2913278975c


Trivial merge