| commit | 6941090eb6eb14d3bd141f72a4af215162094ec0 | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Fri Apr 03 16:29:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 03 16:29:54 2015 +0000 |
| tree | 99e4f8aa3cda18d12a4e240852eef1cb2e687f26 | |
| parent | bce7799786ae712bba9b58f1f99cd12ee05b5cf3 [diff] | |
| parent | 03af2bf6c3a8c81836b572098c3e0be3dc7fc778 [diff] |
am 03af2bf6: (-s ours) am 1e954441: (-s ours) Merge "DO NOT MERGE libgui: Plumb attach/detach through Surface" * commit '03af2bf6c3a8c81836b572098c3e0be3dc7fc778': DO NOT MERGE libgui: Plumb attach/detach through Surface