| commit | 47e2219694002b4d5f5210410d0bc460bee1adef | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 09 12:31:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 09 12:31:49 2013 -0700 |
| tree | 57e49da0b90565c76a1394b8a875fc22e9ae0369 | |
| parent | 85eee52a76b68f698c3b739907b6aada4fb7cee3 [diff] | |
| parent | 146ea8427a124bc27cd77057f4a1cccfda184b87 [diff] |
am 146ea842: (-s ours) am b775f325: (-s ours) Import translations. DO NOT MERGE * commit '146ea8427a124bc27cd77057f4a1cccfda184b87':