commit | e4ef64da702e65719ecf172c9f2bdb3dacc867de | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Nov 04 02:21:23 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 02:21:23 2014 +0000 |
tree | 940f1ae0cb284a802becf20aedb7f2797729df9d | |
parent | 4f03fa903b6ce4ece24b113e0a9440746445a378 [diff] | |
parent | dc9dc7fa9499b279571c7256815448014b1696ed [diff] |
am dc9dc7fa: (-s ours) am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours automerge: ecd9daa -s ours * commit 'dc9dc7fa9499b279571c7256815448014b1696ed': Import translations. DO NOT MERGE