tree 396fc4760831096d7431b84a088902ec225aad91
parent 52077b7a951153ce77e7354c6096b3bcfbec8c3e
parent 92d6d3b2755ba7cf282251431d9a82526ea504e4
author Kenny Guy <kennyguy@google.com> 1412338619 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1412338619 +0000

Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop