tree b676cc16d379478e8afdf21b5e45d0f00b5ec741
parent b1a92a811cf2bba065eb4787ec9516d51b11c000
parent 119351ec52c14d78bd96ade384f7ed974e5cf1e9
author Kenny Guy <kennyguy@google.com> 1445310378 +0000
committer android-build-merger <android-build-merger@google.com> 1445310378 +0000

am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c am: 689cb6366b am: e431703711 am: 0fa7200b5a am: afc9a931cb am: 37ad5ed201 am: 652b89c123 am: b95849feef
am: 119351ec52

* commit '119351ec52c14d78bd96ade384f7ed974e5cf1e9':