| commit | 2e7d6cc48c8c272d2c890a7464dc942f31d4cacf | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri May 04 13:41:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 04 13:41:52 2012 -0700 |
| tree | 3d23ba892fb1adb1067eeaa924a7ffbbb14c8efe | |
| parent | 39e3e0ee16610df749a8d78f1d6e83b5f8c04d08 [diff] | |
| parent | 05cbcc93b7e9a282c138a6f5d85fd5e6d32a893c [diff] |
am 05cbcc93: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev * commit '05cbcc93b7e9a282c138a6f5d85fd5e6d32a893c': Import translations. DO NOT MERGE