diff options
| author | Eric Fischer <enf@google.com> | 2011-03-18 16:55:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-18 16:55:12 -0700 |
| commit | 76fb4bd31a7461f93d1beda9cec009097775b322 (patch) | |
| tree | 65c72a4036595fe03379b499bca2b7307551c5b0 | |
| parent | d48ee36e26a121ba528a56a4a01af22d9ff71679 (diff) | |
| parent | 684f1cf41bd48cadc94dc5f3f20d6fdadd5c1640 (diff) | |
| download | android_packages_apps_HTMLViewer-76fb4bd31a7461f93d1beda9cec009097775b322.tar.gz android_packages_apps_HTMLViewer-76fb4bd31a7461f93d1beda9cec009097775b322.tar.bz2 android_packages_apps_HTMLViewer-76fb4bd31a7461f93d1beda9cec009097775b322.zip | |
am 684f1cf4: resolved conflicts for merge of 6a1413b1 to gingerbread-plus-aosp
* commit '684f1cf41bd48cadc94dc5f3f20d6fdadd5c1640':
Import revised translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions