OSDN Git Service

merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: 6727a1e718 am...
authorTao Bao <tbao@google.com>
Fri, 16 Dec 2016 22:38:09 +0000 (22:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Dec 2016 22:38:09 +0000 (22:38 +0000)
am: 8b3b60cbf9

Change-Id: I7112a6549544245c00cfea6444fdd2f8437521ff


Trivial merge