| commit | 0cab099a164f0ff9217e3784dde031d0e9a0fbae | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 00:50:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:50:56 2015 +0000 |
| tree | 4723eba1ec450b739dcba998010a8a81770cfdad | |
| parent | 057b4e020cf0adfc5cc1e3eae02cea449f7a14dc [diff] | |
| parent | 18c13ccdd62311c09c40077224392f2b5b52e679 [diff] |
am 5d586466: (-s ours) am d0625ced: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '5d586466b262222d13acaef9dc29e33000819d38': Import translations. DO NOT MERGE