| commit | 52520375ff80f63580936ad26392a0337b524e42 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 29 14:51:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 14:51:43 2015 +0000 |
| tree | 284abf1b499e7d841792ec98d27f29bf67b0175d | |
| parent | 6fdb924cbe7e8fa9290ae087e5afba772582d1d7 [diff] | |
| parent | dbb9f370b2ebc5f1f0276fd0af2f4bd93ab25594 [diff] |
am dbb9f370: (-s ours) am 0010f09a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'dbb9f370b2ebc5f1f0276fd0af2f4bd93ab25594': Import translations. DO NOT MERGE