| commit | a3f90f06f5b3b7db18f30eca5322796fc6b4c2e3 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Tue May 26 11:32:53 2009 -0700 |
| committer | Grace Kloba <klobag@google.com> | Tue May 26 11:32:53 2009 -0700 |
| tree | 07b6e040def81a03a4470b03c67261faf4dda9d0 | |
| parent | 2cac3857e10f6597ed5a33bf0260e1212cdd502a [diff] | |
| parent | f2c5c1b555904400f4092888ae81b8ed74bfe026 [diff] |
Merge commit 'f2c5c1b555904400f4092888ae81b8ed74bfe026' into manualfix Conflicts: src/com/android/browser/BrowserSettings.java