tree 04cb84065111e87ee896e2b56a6301043a2bc940
parent 7ec1b902bf3bdd6dfae08519db49301f4efc0861
parent f108ff0f646479731ee7b818958f7b787b151c55
author Kenny Guy <kennyguy@google.com> 1422669744 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669744 +0000

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

* commit 'f108ff0f646479731ee7b818958f7b787b151c55':