tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 7e88e90afc2fce3e64735ee0f11b9098193253d3
parent 5f2a520f0cd47b274bdf809d7b665c956c2717ed
author Kenny Guy <kennyguy@google.com> 1445300933 +0000
committer android-build-merger <android-build-merger@google.com> 1445300933 +0000

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

* commit '5f2a520f0cd47b274bdf809d7b665c956c2717ed':