| commit | 64bb413a664001c95c8439cf097dc3033f4ed733 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Sat Nov 22 00:35:09 2014 +0000 |
| committer | Andreas Gampe <agampe@google.com> | Sat Nov 22 00:35:09 2014 +0000 |
| tree | d4562f7bb5656865d32e5d684b5a41542ecfaf58 | |
| parent | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 [diff] |
Revert "resolved conflicts for merge of 220c3f4f to master" Reverted as hwui doesn't agree. This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9. Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a