tree 2317ad6afbfab1d49ea557dc557cf464da686d79
parent 48954a944aee5cff7104b63f183e9523abaa56fc
parent c15af83cfaf25e4f389c7041ecd40f1f972abb46
author Christopher Wiley <wiley@google.com> 1449274993 +0000
committer android-build-merger <android-build-merger@google.com> 1449274993 +0000

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

* commit 'a1474da3b5a521c2f33494b4a83e50841a399c15':
  libbinder: Don't redefine B_PACK_CHARS