| commit | a0604a788d13df5c2097d8b5c51e3af56b03a9a8 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Nov 13 13:16:11 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 13 13:16:11 2013 -0800 |
| tree | 138c9c97fbfb0011676810543467a3c634e17503 | |
| parent | 0c51446d22764823cfb4bb8137e7fea69d2c20f9 [diff] | |
| parent | 2218d330ad4bda30311d8552cc2140484d636678 [diff] |
am 2218d330: (-s ours) am 814b0b73: (-s ours) am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '2218d330ad4bda30311d8552cc2140484d636678': Import translations. DO NOT MERGE