| commit | efc81e7d5edaa096a90ec17516549f9df49899fa | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Jul 17 10:05:07 2014 -0700 |
| committer | Craig Mautner <cmautner@google.com> | Thu Jul 17 10:05:07 2014 -0700 |
| tree | 29f2a284b886368366cf78599aeed849e1c965ab | |
| parent | fad2c9a25752f28450a03ed1fa381b348a45b637 [diff] | |
| parent | 75f317403f9bf7bbd3de8ec50868cb727f17ac45 [diff] |
resolved conflicts for merge of 75f31740 to lmp-dev Conflicts: services/core/java/com/android/server/wm/WindowManagerService.java Change-Id: Ifdfe253c4b3410a6000fd5a7cdcd785adc80a47b