diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-13 21:09:35 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-03-13 21:09:35 -0700 |
| commit | ff89d589c7eb32265bf70068ffaef24104a580a5 (patch) | |
| tree | 3d0070f57be1fc8fa131767afffb789cd9f16ce6 /tests/CanvasCompare/src | |
| parent | 51b921d0e33302b3f431dcfa15bd6588408525ea (diff) | |
| parent | 3b9de0a429910cd66e5360b279328778bb710083 (diff) | |
| download | frameworks_base-ff89d589c7eb32265bf70068ffaef24104a580a5.zip frameworks_base-ff89d589c7eb32265bf70068ffaef24104a580a5.tar.gz frameworks_base-ff89d589c7eb32265bf70068ffaef24104a580a5.tar.bz2 | |
Merge commit '3b9de0a4' into manualmerge
Conflicts:
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Change-Id: I5433912e9d97a20bec6c8e287450550daab6d89b
Diffstat (limited to 'tests/CanvasCompare/src')
0 files changed, 0 insertions, 0 deletions