diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-10 21:58:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-10 21:58:59 +0000 |
| commit | 513250e31045f1052262217e554765b157ed8cc9 (patch) | |
| tree | f6e87eb8431e3629a9af7406e9ce1f6148698722 /docs/html/sdk/api_diff/15/changes | |
| parent | d9a7b8d5a5f96c0ecc6681201d6810a0d99a4dd0 (diff) | |
| parent | 0840f961e52d45df25f86b2390eb1afa7f3b4e90 (diff) | |
am 0840f961: (-s ours) am b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 2a5f0b4 -s ours
* commit '0840f961e52d45df25f86b2390eb1afa7f3b4e90':
Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/sdk/api_diff/15/changes')
0 files changed, 0 insertions, 0 deletions