tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent 29a81daa0d2faecca8fbaa36e04d85ac94242088
parent e431703711bf883b139f41fdd21ecf3c34b79ea8
author Kenny Guy <kennyguy@google.com> 1445303572 +0000
committer android-build-merger <android-build-merger@google.com> 1445303572 +0000

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

* commit 'e431703711bf883b139f41fdd21ecf3c34b79ea8':