commit | 0fedffaeeccef2e0c438a6622011c2308c4bdc03 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Thu May 17 15:32:19 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 17 15:32:19 2012 -0700 |
tree | 44da0ca5fabcd1fe8e6936dd56651c363aac42e3 | |
parent | 8acef92d7b756c1164b9e8f1d288f439c2bd0dc3 [diff] | |
parent | 1934cc6e7484318f4a977f13a0d6fee9f4ef0646 [diff] |
am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE * commit '54e55fee195e146935b86ae4fc9c253a8f7001f4': Import translations. DO NOT MERGE