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