| commit | a653b57df64c5ec9f39ce389d4e9dd134cfcea3a | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Wed Sep 23 19:50:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 19:50:33 2015 +0000 |
| tree | 770a932c6e19ba60dc55a3bcbf5968653cc91491 | |
| parent | c99e2c9a207b02117d533357449506c4391e0d52 [diff] | |
| parent | e0efd8bd5dc3bb03be2e252003f4ba11f96ac583 [diff] |
am c565bdb6: am f777655d: resolved conflicts for 6ee734cf to stage-aosp-master * commit 'c565bdb67b801fe2b4965b44e53dccfd9097993c': libutils: hide SharedBuffer by moving SharedBuffer.h to the implementation directory