commit | d716d4749cf8aad2510a314f8a7398dd0aa82265 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Nov 19 19:36:06 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 19:36:06 2014 +0000 |
tree | 3de9a415564e68f5ea809deb7e4737f9e6158fce | |
parent | d15068d15a2acdbcc25900f1684eb8b48a996627 [diff] | |
parent | 6ed3dc44b6a7abca582f2e05656562c09af369b0 [diff] |
am 6ed3dc44: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '6ed3dc44b6a7abca582f2e05656562c09af369b0': Import translations. DO NOT MERGE