diff options
| author | Geoff Mendal <mendal@google.com> | 2015-01-16 00:06:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 00:06:36 +0000 |
| commit | 58b859163cf9a35eafff5f488dd277832fb3742a (patch) | |
| tree | 31dd567f4015bf800bb50af5e0b0b8ef97e14f1b /docs/html/sdk/api_diff/12 | |
| parent | c62d355b3f19aee442070af11679e8e313d831f0 (diff) | |
| parent | 6ba9c529fda8aba5f1157b4ff3feb1a494e673ad (diff) | |
am 6ba9c529: (-s ours) am d3403e45: (-s ours) am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '6ba9c529fda8aba5f1157b4ff3feb1a494e673ad':
Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/sdk/api_diff/12')
0 files changed, 0 insertions, 0 deletions