OSDN Git Service

resolve merge conflicts of f2304ce to nyc-mr1-dev
authorIan Pedowitz <ijpedowitz@google.com>
Fri, 3 Jun 2016 19:50:41 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 19:50:41 +0000 (19:50 +0000)
am: 637c0192fc

* commit '637c0192fcede4e91b4040bf9c486dfe1fb93d74':
  NYC is now REL

Change-Id: Id0a79354dedbe45304e7d93f650878c2ba184262


Trivial merge