tree c028bfe537607823c37e2ffc8c713c73059d3130
parent b75de587c52ee4f9ba5ada289c0675f1fafdc7f9
parent 689cb6366b4cc4a205ad7a3696c04fe6f5ec28c3
author Kenny Guy <kennyguy@google.com> 1445302477 +0000
committer android-build-merger <android-build-merger@google.com> 1445302477 +0000

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

* commit '689cb6366b4cc4a205ad7a3696c04fe6f5ec28c3':