diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2009-10-22 18:44:32 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2009-10-22 18:44:32 -0700 |
| commit | 8eef2dd94509afa1245d1106ae7feec21be439c4 (patch) | |
| tree | 2e2e7e45ce8482b9449688e1b68b48aac7f4caf0 /docs/html/guide/tutorials/localization/index.jd | |
| parent | 46b9e216a2492544d0a081d8df57afd33349f36e (diff) | |
| parent | 9b7fb57c6e41662197373888cf47656cb2f3adda (diff) | |
| download | frameworks_base-8eef2dd94509afa1245d1106ae7feec21be439c4.zip frameworks_base-8eef2dd94509afa1245d1106ae7feec21be439c4.tar.gz frameworks_base-8eef2dd94509afa1245d1106ae7feec21be439c4.tar.bz2 | |
Merge commit '9b7fb57c' into manualmerge
Conflicts:
docs/html/sdk/android-1.5.jd
Diffstat (limited to 'docs/html/guide/tutorials/localization/index.jd')
0 files changed, 0 insertions, 0 deletions