commit | 1df9bc5c1d47a09b08d49287d81832e18674bece | [log] [tgz] |
---|---|---|
author | Craig Mautner <cmautner@google.com> | Tue Mar 25 18:19:24 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 18:19:24 2014 +0000 |
tree | 654cf7a5e2bdd359020114a653c26657b85f1e7c | |
parent | e77786d51f574ca7bbb45df136f92fc7c7d06ffe [diff] | |
parent | d7bf82d6a422a8b10e2a9bea7f4e3fcdc804d19b [diff] |
am d7bf82d6: am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev * commit 'd7bf82d6a422a8b10e2a9bea7f4e3fcdc804d19b': Move task to top in window manager.