| commit | ff89d589c7eb32265bf70068ffaef24104a580a5 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Mar 13 21:09:35 2014 -0700 |
| committer | Craig Mautner <cmautner@google.com> | Thu Mar 13 21:09:35 2014 -0700 |
| tree | 3d0070f57be1fc8fa131767afffb789cd9f16ce6 | |
| parent | 51b921d0e33302b3f431dcfa15bd6588408525ea [diff] | |
| parent | 3b9de0a429910cd66e5360b279328778bb710083 [diff] |
Merge commit '3b9de0a4' into manualmerge Conflicts: policy/src/com/android/internal/policy/impl/PhoneWindowManager.java Change-Id: I5433912e9d97a20bec6c8e287450550daab6d89b