tree 88f930c0ea93329dc4193ce2fe49e0241a09d515
parent f38a2eb1648dffc44ada50d4344f37679ae55b34
parent 5f2a520f0cd47b274bdf809d7b665c956c2717ed
author Kenny Guy <kennyguy@google.com> 1413648494 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413648494 +0000

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

* commit '5f2a520f0cd47b274bdf809d7b665c956c2717ed':
  Remove reference to CODENAME from compat code.