| commit | 69f0e0bf67357ec6672a4e70debfca4a022ee4af | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Nov 06 20:06:05 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 20:06:05 2013 -0800 |
| tree | 636aacdb9e560d948d4a8da6d7afaabfd05e6eed | |
| parent | fd0afe66b190f672c193a562f590104ad8d71dc8 [diff] | |
| parent | 1aca6e04f54cd2144a8acb8fb26e87afe93a42e3 [diff] |
am 1aca6e04: (-s ours) am 6695fa52: (-s ours) am 5be3186b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1aca6e04f54cd2144a8acb8fb26e87afe93a42e3': Import translations. DO NOT MERGE