tree 9dd4cb0afc56875f0dc64d84f844cd01ce8ec136
parent 114269b46ce7b9b24627d9368873aa97e4e45e5a
parent 22a496cabd1e6d36dbf8a5acb3c57f39335148ca
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