| commit | d7bf82d6a422a8b10e2a9bea7f4e3fcdc804d19b | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Mar 25 18:14:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 18:14:15 2014 +0000 |
| tree | 9fd824aa97918e7c30f4ac4c6e0b4a852456ed02 | |
| parent | 99d607844da2b100afe3d134c1c006f4cc5b35b1 [diff] | |
| parent | f32b22e9c78cbc0109adbad67e9ff3d7045bd954 [diff] |
am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev * commit 'f32b22e9c78cbc0109adbad67e9ff3d7045bd954': Move task to top in window manager.