tree 8eb174fff426cb5d1f0d0673ece4f60b92a2b5e3
parent adf571c7725f0281a3e37a4b6254818da956ca53
parent 0cd271918a7c7baa69e872f7128351a0c7dbbbae
author Kenny Guy <kennyguy@google.com> 1412338824 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412338824 +0000

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

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