tree 82db2e21449fd52665d7cff5f67b72ea655d185f
parent 1c38f7e1d3a18b6c5ac84f9600a3db9667f34591
parent 652b89c1233c38c94b95e7be684621d3283fbbd5
author Kenny Guy <kennyguy@google.com> 1445307815 +0000
committer android-build-merger <android-build-merger@google.com> 1445307815 +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

* commit '652b89c1233c38c94b95e7be684621d3283fbbd5':