diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-22 00:35:09 +0000 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-22 00:35:09 +0000 |
| commit | 64bb413a664001c95c8439cf097dc3033f4ed733 (patch) | |
| tree | d4562f7bb5656865d32e5d684b5a41542ecfaf58 /cmds/media/NOTICE | |
| parent | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (diff) | |
| download | frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.zip frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.tar.gz frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.tar.bz2 | |
Revert "resolved conflicts for merge of 220c3f4f to master"
Reverted as hwui doesn't agree.
This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.
Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a
Diffstat (limited to 'cmds/media/NOTICE')
0 files changed, 0 insertions, 0 deletions