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 23:01:45 +0000 (23:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Dec 2016 23:01:45 +0000 (23:01 +0000)
am: 393520d70a

Change-Id: I14123dad24c8f85de43ec9134b1ef64b83cef2e7


Trivial merge