| commit | 6f718d173a7554eb9716c55a95bd00ce3cdc2640 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jun 23 04:40:37 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 23 04:40:37 2016 +0000 |
| tree | deab7ab595f4b333b463e0db7a46e8d9e3f5718a | |
| parent | 890853a1bf6054ddd3e6e7a5ad7076ae3abf3e39 [diff] | |
| parent | 7411a2aa0cec49c6a258678e9f09845383af17e7 [diff] |
Merge "DO NOT MERGE: drm_hwcomposer: On error, free active composition am: b4cf01b8ea am: 7ca7746261" into nyc-mr1-dev-plus-aosp