| commit | 0f49d40eb9fbc8c4fe3515b23784dd521d8d4a8d | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 09 12:31:33 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 09 12:31:33 2013 -0700 |
| tree | 57e49da0b90565c76a1394b8a875fc22e9ae0369 | |
| parent | d7dcc2e787371ebcc34672fbe3828b32857e5825 [diff] | |
| parent | 9922002f58da90295f04c24137cdb2e1dbfbb7a4 [diff] |
am 9922002f: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '9922002f58da90295f04c24137cdb2e1dbfbb7a4': Import translations. DO NOT MERGE