tree 791e8a024420d9fc398174c0a56fc1722d4c771c
parent b05dcc69adc6b2ee08cd6ab619e6592a1668aca4
parent 37ad5ed201a3b5e6caa9933be3702adf4b877150
author Kenny Guy <kennyguy@google.com> 1445306778 +0000
committer android-build-merger <android-build-merger@google.com> 1445306778 +0000

am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c am: 689cb6366b am: e431703711 am: 0fa7200b5a am: afc9a931cb
am: 37ad5ed201

* commit '37ad5ed201a3b5e6caa9933be3702adf4b877150':