tree fae97afa559ac30497bf7b5d1df2009236f8dde7
parent ec22417993d2a9a98ee957ffc7cd4af95debb546
parent f777655d85af3aefa4a1683f289da1ec67988330
author Sergio Giro <sgiro@google.com> 1443028512 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443028512 +0000

am f777655d: resolved conflicts for 6ee734cf to stage-aosp-master

* commit 'f777655d85af3aefa4a1683f289da1ec67988330':
  libutils: hide SharedBuffer by moving SharedBuffer.h to the implementation directory