tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent 9a4f2f42c9a6518002547fff05109c9d8b110a6f
parent afc9a931cbabf849d79d55cc6bcd4dda6e728821
author Kenny Guy <kennyguy@google.com> 1445305776 +0000
committer android-build-merger <android-build-merger@google.com> 1445305776 +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

* commit 'afc9a931cbabf849d79d55cc6bcd4dda6e728821':