diff options
author | Baligh Uddin <baligh@google.com> | 2020-12-15 15:41:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 15:41:59 +0000 |
commit | b909fa00efa5a1b0dc023c1225f6f4ac0360f66f (patch) | |
tree | 973df8a89a78631e5a384367fb9ffb3ff78acff6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 2baaa8231cd3b4faba1bef9b45ca5e069be2c8fa (diff) | |
parent | 86a5ca2c1466a2d0c5d9f95d6fc03ae1edf00a32 (diff) |
[automerger skipped] Merge "Migrate to frameworks/proto_logging/stats" into rvc-qpr-dev-plus-aosp am: 86a5ca2c14 -s ours
am skip reason: Change-Id I680ab455cf22878436d1843b6710bf05f3d90c96 with SHA-1 3b22f9b76d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13206669
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If2f318e7847e2006ba4e4664ccc864fb5f96764a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions