| commit | a6d6bb1eebe738b44e255f2ca902899b6dc90bdf | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Sep 11 18:31:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 11 18:31:43 2014 +0000 |
| tree | 0b9d2a40ab57f1569aa5c5bb56606b53d82377b1 | |
| parent | 6b2ce3ee4d12ab306061570b5e48d1f378086e13 [diff] | |
| parent | 200e42475253b238b4201df6e4499c3208b52c21 [diff] |
am 200e4247: (-s ours) am 3dc60179: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '200e42475253b238b4201df6e4499c3208b52c21': Import translations. DO NOT MERGE