diff options
| author | Eric Fischer <enf@google.com> | 2011-04-05 10:27:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-05 10:27:58 -0700 |
| commit | 39d35d3478dca214f6f494a3915384adacdb7040 (patch) | |
| tree | 65c72a4036595fe03379b499bca2b7307551c5b0 | |
| parent | 24e8c6cb897eeee16b05b897ece23894be025d8b (diff) | |
| parent | 2f860f1536a53b4dc49bfa1792d2ca56ecc03309 (diff) | |
| download | android_packages_apps_HTMLViewer-39d35d3478dca214f6f494a3915384adacdb7040.tar.gz android_packages_apps_HTMLViewer-39d35d3478dca214f6f494a3915384adacdb7040.tar.bz2 android_packages_apps_HTMLViewer-39d35d3478dca214f6f494a3915384adacdb7040.zip | |
am 2f860f15: (-s ours) am 63fff9c7: resolved conflicts for merge of 3a6928aa to gingerbread-plus-aosp
* commit '2f860f1536a53b4dc49bfa1792d2ca56ecc03309':
Import revised translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions