diff options
| author | Tom Hsu <tomhsu@google.com> | 2020-06-10 03:24:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 03:24:10 +0000 |
| commit | 97a79daf72b6c9bfab119933744b5c5d931b98c5 (patch) | |
| tree | 6c928676b8bbaf6620154eb126cc72729a6c4712 /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | 15148629eaf24e4c9ff18e4114a7f80272eb6883 (diff) | |
| parent | f87d3e42fde4d20c2ac0a49632b782a5c4ac5664 (diff) | |
[automerger skipped] Merge "New shortcodes to safelist (Q2 2020)" into rvc-dev am: 4992fd1120 -s ours am: 604729c361 -s ours am: f87d3e42fd -s ours
am skip reason: Change-Id I4b1b0337a9d3531d74d3e5a31ea246a80ac1c280 with SHA-1 e6bf432df8 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11733422
Change-Id: Iaaa57757734bda4e9cb8576c14a0604c7e4c3d9a
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions