Commit bd98e7f


John Spurlock
The Android Automerger
1 parent 9f6a3c2 commit bd98e7f
File tree
4 files changed
+34
-69
lines changed- core
- java/com/android/internal/inputmethod
- res/res
- layout
- values
- policy/src/com/android/internal/policy/impl
4 files changed
+34
-69
lines changedLines changed: 0 additions & 61 deletions
This file was deleted.
Lines changed: 2 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
18 | 18 |
| |
19 | 19 |
| |
20 | 20 |
| |
21 |
| - | |
| 21 | + | |
22 | 22 |
| |
23 | 23 |
| |
24 | 24 |
| |
25 | 25 |
| |
26 |
| - | |
27 | 26 |
| |
28 | 27 |
| |
29 | 28 |
| |
| |||
54 | 53 |
| |
55 | 54 |
| |
56 | 55 |
| |
57 |
| - | |
58 |
| - | |
59 |
| - | |
60 |
| - | |
61 |
| - | |
| 56 | + |
Lines changed: 0 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
105 | 105 |
| |
106 | 106 |
| |
107 | 107 |
| |
108 |
| - | |
109 | 108 |
| |
110 | 109 |
| |
111 | 110 |
| |
|
Lines changed: 32 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
23 | 23 |
| |
24 | 24 |
| |
25 | 25 |
| |
| 26 | + | |
| 27 | + | |
26 | 28 |
| |
27 | 29 |
| |
28 | 30 |
| |
| |||
1920 | 1922 |
| |
1921 | 1923 |
| |
1922 | 1924 |
| |
| 1925 | + | |
| 1926 | + | |
| 1927 | + | |
1923 | 1928 |
| |
1924 | 1929 |
| |
1925 | 1930 |
| |
| |||
2479 | 2484 |
| |
2480 | 2485 |
| |
2481 | 2486 |
| |
| 2487 | + | |
| 2488 | + | |
| 2489 | + | |
| 2490 | + | |
| 2491 | + | |
| 2492 | + | |
| 2493 | + | |
| 2494 | + | |
| 2495 | + | |
| 2496 | + | |
| 2497 | + | |
| 2498 | + | |
| 2499 | + | |
| 2500 | + | |
| 2501 | + | |
| 2502 | + | |
| 2503 | + | |
| 2504 | + | |
| 2505 | + | |
| 2506 | + | |
| 2507 | + | |
| 2508 | + | |
| 2509 | + | |
| 2510 | + | |
| 2511 | + | |
| 2512 | + | |
| 2513 | + | |
2482 | 2514 |
| |
2483 | 2515 |
| |
2484 | 2516 |
| |
|
0 commit comments