| commit | fe03081de31eb9dd1a48d726fd961bf7821f8a7f | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Mar 30 20:05:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 30 20:05:19 2012 -0700 |
| tree | f9353e8e8bf64e388e28084db01791006952986d | |
| parent | e725821201147a5b1fcc220db1dfccf40de4f84a [diff] | |
| parent | 5797c5023f940b6518b24ddb7a76591c936899af [diff] |
am 5797c502: (-s ours) am ca0d6822: Import translations. DO NOT MERGE * commit '5797c5023f940b6518b24ddb7a76591c936899af': Import translations. DO NOT MERGE