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