diff options
| author | John Reck <jreck@google.com> | 2011-05-23 18:11:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-23 18:11:12 -0700 |
| commit | efe9aeab92137078d7c7273089526f11582bfcfc (patch) | |
| tree | 1471dabf892882fe0dadaa0d8eaa8b117cea7d7a /src/com/android/browser/preferences | |
| parent | b8b2af8be793c442add61afbe852d55ef978361c (diff) | |
| parent | adc265c093ddda9aeee3abc88861718713ea383a (diff) | |
| download | packages_apps_Browser-efe9aeab92137078d7c7273089526f11582bfcfc.tar.gz packages_apps_Browser-efe9aeab92137078d7c7273089526f11582bfcfc.tar.bz2 packages_apps_Browser-efe9aeab92137078d7c7273089526f11582bfcfc.zip | |
am adc265c0: (-s ours) am 7d019020: DO NOT MERGE use -sw instead of -w
* commit 'adc265c093ddda9aeee3abc88861718713ea383a':
DO NOT MERGE use -sw instead of -w
Diffstat (limited to 'src/com/android/browser/preferences')
0 files changed, 0 insertions, 0 deletions