| commit | b86f234a51c7e642cc4fa392d375914a6220de0a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:46:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:46:51 2015 +0000 |
| tree | 55f124a60d3055465a2303d05c8cea510af30024 | |
| parent | 70c949f0623edd2d9ef1b50a6978e9b1b2688b77 [diff] | |
| parent | 5e3c285436e718610385b058625492768496474a [diff] |
am 5e3c2854: (-s ours) am aa70f60b: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '5e3c285436e718610385b058625492768496474a': Import translations. DO NOT MERGE