| commit | 2834bb5bd9b8f92d00c35130d73016c994f55e66 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Jun 29 17:57:00 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 29 17:57:00 2012 -0700 |
| tree | f9df011e94dfa74e99394bce86ecc8f5482e59e3 | |
| parent | 846387c13d709505db1eb0102bc1663e046ac677 [diff] | |
| parent | 6979f522082ea27f21982c68ed65b7c2a2b8967a [diff] |
am 6979f522: (-s ours) am 2612de14: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '6979f522082ea27f21982c68ed65b7c2a2b8967a': Import translations. DO NOT MERGE