| commit | 7e36b40c4d141146404b7eaef87355707dfa3a61 | [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 | 1bf933ea1eafaf54e768c580fdda84e590c3d474 | |
| parent | ef65538a7065d4caa4a3c5aae156d82645611277 [diff] | |
| parent | 5d586466b262222d13acaef9dc29e33000819d38 [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