commit | 43db808500c47eee307815729601def90715c2b0 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Apr 09 12:31:53 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 09 12:31:53 2013 -0700 |
tree | 57e49da0b90565c76a1394b8a875fc22e9ae0369 | |
parent | 741a81560030f90eddd2fa56b4cb1f7b35bd0a9f [diff] | |
parent | f351b6c0095a449f72342e88ecd88c18abb414c5 [diff] |
am f351b6c0: (-s ours) am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE * commit 'f351b6c0095a449f72342e88ecd88c18abb414c5':