resolved conflicts for merge of 167449e5 to master

Browse Source

Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67

...

This commit is contained in:

Jeff Brown

2010-07-08 19:01:13 -07:00

parent 6f10db885f 167449e5f8

commit 1a33274d28

23 changed files with 892 additions and 6101 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2098

services/java/com/android/server/WindowManagerService.java

File diff suppressed because it is too large Load Diff