commit | 104aaf0153be17fa613465a85fb958e2fbd4dc39 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 17 15:43:16 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 17 15:43:16 2016 +0000 |
tree | ba3ec827afbd5aac79d18088550008610556a1d8 | |
parent | d6d8bdfc23e244b31d9c832dcd27bbf0a7a8463e [diff] | |
parent | 934b07ea3a5b944fd0ed1a665c55e3d4b9e78209 [diff] |
Merge "DO NOT MERGE: drm_hwcomposer: Don\'t use Plan() in SquashAll am: 8eb85ff7d7 -s ours am: 45ea1b1c69" into nyc-mr1-dev-plus-aosp