tree de5d4efd926f42eb4e789d5ffb78df56483cebb2
parent 18f8bb0f82c2ed7367e7fdf05bac2f86dac128d8
parent d6817a3a5dd1589ef50028f26789422dd3b48a0e
author Christopher Wiley <wiley@google.com> 1448302989 +0000
committer android-build-merger <android-build-merger@google.com> 1448302989 +0000

Merge "libbinder: Add support for C++ Parcelable" am: 49b5443a49
am: 6c31acd969

* commit '6c31acd969ffc754e514885fa7f4d0c25403f580':
  libbinder: Add support for C++ Parcelable