OSDN Git Service

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

Change-Id: I01fb922ced6599fa4a56d29950e153b5f1b52821


Trivial merge