tree 4a1c1c421d90eff370a82eb33a38bc660dcac4f5
parent 61e811370dec47396ff4c0732f19b30cf1f88605
parent ddc0c5e0a0b65b4ce9bb5a295a49caf565b87857
author Ian Pedowitz <ijpedowitz@google.com> 1465355384 +0000
committer android-build-merger <android-build-merger@google.com> 1465355384 +0000

Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am: ddc0c5e0a0

Change-Id: I9c08a086b508b78ddecc53e0aae08d25460f0595