tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 6e77e0da19bfa6fad63f3da3fc5d726c9b37313a
parent 10484dfe2e431619866b3920368d62c84892d3aa
author Kenny Guy <kennyguy@google.com> 1422685377 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685377 +0000

am 10484dfe: am f108ff0f: am ebb2a66b: am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop

* commit '10484dfe2e431619866b3920368d62c84892d3aa':