tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent d077b9d13700e9ce2271cb557b8788185ad2bbe9
parent 0fa7200b5ac94f4ed45a1849ff26da3a5a65cb53
author Kenny Guy <kennyguy@google.com> 1445304665 +0000
committer android-build-merger <android-build-merger@google.com> 1445304665 +0000

am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c am: 689cb6366b am: e431703711
am: 0fa7200b5a

* commit '0fa7200b5ac94f4ed45a1849ff26da3a5a65cb53':