tree 88f930c0ea93329dc4193ce2fe49e0241a09d515
parent b1e6628ee8dfe797a5d5c9d15ffb890a28b38ca9
parent ad7be0b20952740a1de452ffac182dd51bc4f16b
author Kenny Guy <kennyguy@google.com> 1413649677 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413649677 +0000

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

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