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

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

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