| commit | e0efd8bd5dc3bb03be2e252003f4ba11f96ac583 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Wed Sep 23 17:15:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 17:15:12 2015 +0000 |
| tree | fae97afa559ac30497bf7b5d1df2009236f8dde7 | |
| parent | 9174f26730e307bfc2dc64806734b6916ce1a767 [diff] | |
| parent | 32ee05818f05b933a6999deb8dec70c96e297310 [diff] |
am f777655d: resolved conflicts for 6ee734cf to stage-aosp-master * commit 'f777655d85af3aefa4a1683f289da1ec67988330': libutils: hide SharedBuffer by moving SharedBuffer.h to the implementation directory