| commit | af13b025e9d7dcf262e13588c8471b7360ce4070 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 22 10:14:35 2014 -0700 |
| committer | Geoff Mendal <mendal@google.com> | Tue Jul 22 10:14:35 2014 -0700 |
| tree | 6803ebeab0cbcf5cd6b65bf6f40e74e3d8b8e716 | |
| parent | 5323ab70db8834b2482567e924f19123bc02bea2 [diff] | |
| parent | e959e4a01773a0bd1f3fb76b4333e59f03fb2f5c [diff] |
Merge commit 'e959e4a0' into lmp-dev Conflicts: services/core/java/com/android/server/wm/WindowManagerService.java