commit | 6394e1e0d94f024cbf0f657a0c6cf213107b68c4 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Oct 04 13:34:19 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 04 13:34:19 2013 -0700 |
tree | 72e69a7ae77957f9eecab174a2c5ee45283ce8c7 | |
parent | 783b4c7c44fecf6bd90617f03bab163301e85693 [diff] | |
parent | ba78a70c1d3bb5d135d3233d5479f41ed7183b0b [diff] |
am ba78a70c: (-s ours) am 548622a2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ba78a70c1d3bb5d135d3233d5479f41ed7183b0b': Import translations. DO NOT MERGE