| commit | 29526ccad0b67dd93eae034fa8cc80341cab69db | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 16:55:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 16:55:01 2014 +0000 |
| tree | 1138b3ef4db2724a78bd0c97a8b163db83f5b631 | |
| parent | 27fa561f56bac8867e462fc793fecaf3449c5158 [diff] | |
| parent | 8907801268b62dfadaf8c9f73d60ffaea6dbf904 [diff] |
am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '8907801268b62dfadaf8c9f73d60ffaea6dbf904': Import translations. DO NOT MERGE