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