tree f71080f56e0374e377256a64777ad7466d24139f
parent 4eeb8a5c9e3a88e0176e3584d9412baa24bd745e
parent cd6a2ef691228640d13ab8f96c6158fe281593ee
author Casey Dahlin <sadmac@google.com> 1450144871 -0800
committer android-build-merger <android-build-merger@google.com> 1450144871 -0800

Merge "Don\'t redefine B_PACK_CHARS" am: 478259b574
am: e9ddb0d00d

* commit 'e9ddb0d00d935ed64a78bc212197ca84b090be13':
  Don't redefine B_PACK_CHARS