diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 00:40:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 00:40:46 +0000 |
| commit | 14ab05957b64d60ffbaf2dc209d878489d9bb234 (patch) | |
| tree | 1bbbf12a138f2b94162ffc5c96051635f146cfb5 /docs/html/sdk/api_diff/11 | |
| parent | 4cf7e7735f3a98dde89704b04f2ebb2ae6d80daf (diff) | |
| parent | 44eb11cd710f02e4da97c96723ee249a4e617d1d (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 75cb80445b -s ours" into rvc-d1-dev-plus-aosp am: bc603d40a7 -s ours am: 44eb11cd71 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11900658
Change-Id: I7c08536f0cad83c1f3386037c5df701a7398d47f
Diffstat (limited to 'docs/html/sdk/api_diff/11')
0 files changed, 0 insertions, 0 deletions