| commit | 0c066cc32aa8652a59b9a1693e2affec57d0fad0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Apr 30 12:50:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:11 2014 +0000 |
| tree | af39ceb9c6cb26c3ee1ea02c1e03de9a2486ac93 | |
| parent | d0dc34c7ced505b0f37bef5ca39d7da1913b7a18 [diff] | |
| parent | cd96200ad439a7211c7434ae6f0e9a4bf7c075f2 [diff] |
am cd96200a: (-s ours) am ace17549: (-s ours) am c1f2a213: (-s ours) am ea8ec3cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'cd96200ad439a7211c7434ae6f0e9a4bf7c075f2':