commit | bc89f3ea7a1a8eb379f16f8b874727e928f4f669 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Oct 15 18:05:55 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 15 18:05:55 2020 +0000 |
tree | 3abda062570a570a7a69fa3c4863ea7d99a12ca2 | |
parent | a6ff8a2830d1caa59866f13543fa3d10a20b320b [diff] | |
parent | 9a46d248ed827670e871d9001aa539390957b4ba [diff] |
[automerger skipped] Merge changes from topic "update_sysprop_api_txt" am: da2ce9eae8 am: 08a11ec1b5 am: 732c8b8f4a am: 9a46d248ed -s ours am skip reason: Change-Id Ie6d6ff5ed6c3883cb3459b8fb57ca18f4ce28098 with SHA-1 032f11ee7f is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1462123 Change-Id: Ib873881e176e6d4c79a97267029c0e6258946787