commit | fa2f9d603cac01120a70a255a65c974dbd4447ae | [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 | 8764f22a90f2935f14fd525c7f248de7015065d4 [diff] | |
parent | c565bdb67b801fe2b4965b44e53dccfd9097993c [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