tree 4ff7198df257f3a36c5c5b6a522aab186600e6e7
parent f08ff22bc3ea2c12015040071dbc68abda13f4bb
parent ebb2a66b79b2761ed29f2f8a3140217c126e448b
author Kenny Guy <kennyguy@google.com> 1422666561 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666561 +0000

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

* commit 'ebb2a66b79b2761ed29f2f8a3140217c126e448b':