diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-18 02:31:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 02:31:13 +0000 |
| commit | 2435e06d49e90462b8d97f6c5cbef2c80e705f4d (patch) | |
| tree | 0492fb3b8cf419af61d481a28a4ac6f47dd3cd6b /docs/html/sdk/api_diff/12 | |
| parent | b102119666d721f1dc3c73a8a43b4eac667b3a68 (diff) | |
| parent | bb12bfb1a647ac2a30476b4585be5c9f3af28548 (diff) | |
am bb12bfb1: (-s ours) am db590124: (-s ours) am 6e523a07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'bb12bfb1a647ac2a30476b4585be5c9f3af28548':
Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/sdk/api_diff/12')
0 files changed, 0 insertions, 0 deletions