diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-10 21:59:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-10 21:59:28 +0000 |
| commit | 93cfdbe173861b72fea4e69d73d71e73df0cc515 (patch) | |
| tree | 124825374fa6bd53d980168d3fda571b4cfa8ca8 /docs/html/sdk/api_diff/15 | |
| parent | d2a432087510de7bac019c28ec321989b99a7a6d (diff) | |
| parent | 94f01a767ae91c660a9cd3ff77a0871ea9a54085 (diff) | |
am 94f01a76: (-s ours) am 295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 2f5e130 -s ours
* commit '94f01a767ae91c660a9cd3ff77a0871ea9a54085':
Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/sdk/api_diff/15')
0 files changed, 0 insertions, 0 deletions