| commit | 1b4b87c2aec1ea5487e7279e92114bb1dca013b6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 00:51:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:51:40 2015 +0000 |
| tree | 1bf933ea1eafaf54e768c580fdda84e590c3d474 | |
| parent | 28e682cb5dfb24e7aaa668a6d1edd4589c153180 [diff] | |
| parent | 4d9031bda69fbf7b48241539788db8560b3953b2 [diff] |
am 4d9031bd: (-s ours) am 50b04190: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '4d9031bda69fbf7b48241539788db8560b3953b2': Import translations. DO NOT MERGE