OSDN Git Service

Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev
authorIan Pedowitz <ijpedowitz@google.com>
Fri, 3 Jun 2016 18:49:24 +0000 (18:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 18:49:24 +0000 (18:49 +0000)
am: 216b1ed2f5

* commit '216b1ed2f515c4b7fb97f17a59660b0a44dcdd71':
  Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""

Change-Id: I65bd31fcaf78ad40e3ac42221acfea740207e740


Trivial merge