tree 34525eec43932734b12fd6cb3a083f221205c8b0
parent c0740a14a48a4d6dfd9423a402a4f695d738db06
parent 14c2a1586b03b1b03a3f36ed626d93f6d32687e7
author Ian Pedowitz <ijpedowitz@google.com> 1467831252 +0000
committer android-build-merger <android-build-merger@google.com> 1467831252 +0000

Merge \"Revert \"Revert \"Revert \"Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"\"\"\"\" into nyc-mr1-dev
am: 14c2a1586b

Change-Id: I1b95f5049e64a536834f785157748ae20ec9e8a1