tree 0684f0fff93e2012d8517450bcefb8880e0dac54
parent eea3802b2c3e9a244a6e84fdfcdb7955bbe2ad2b
parent 295ad1f1f160e229417d604e62483e1871f20f4a
author Tao Bao <tbao@google.com> 1463608788 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1463608788 +0000

Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev