tree c30a3694f47c96c312d634bdb629dd619d574fd0
parent 91c11b28d57c026d507488c58feedebf7fee6f31
parent 0cd271918a7c7baa69e872f7128351a0c7dbbbae
author Kenny Guy <kennyguy@google.com> 1413648345 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413648345 +0000

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

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