| commit | 7d8bb82dca1f2396ce611bd1587158aa0895ec46 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Sep 07 18:39:03 2010 -0700 |
| committer | Ying Wang <wangying@google.com> | Tue Sep 07 18:39:03 2010 -0700 |
| tree | b1ff7ee3fb8fd01143108e4683891b6da5c59ff8 | |
| parent | c24ffe6fdc34964442f2fe4c223c856bde8e1e96 [diff] | |
| parent | d348ea6e0ad3fc029a01c214da4ad4b8d856c4f9 [diff] |
Merge commit 'd348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge Conflicts: core/res/res/values/public.xml Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1