tree 4c2eb05c9e304f1882436f9ea817ea204fbb148e
parent c9219ca9a24d2e2466390a1754c3c528ebe00e78
parent b6d78b1c13ea107c0f70e9fd90ac73e7383ba47d
author Christopher Wiley <wiley@google.com> 1449275287 +0000
committer android-build-merger <android-build-merger@google.com> 1449275287 +0000

Merge "libbinder: Don\'t redefine B_PACK_CHARS" am: 7166e7823c am: a1474da3b5
am: 22a496cabd

* commit '22a496cabd1e6d36dbf8a5acb3c57f39335148ca':
  libbinder: Don't redefine B_PACK_CHARS