summaryrefslogtreecommitdiff
path: root/libs/rs/rsg_ScriptJavaClass.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-10 17:40:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-10 17:40:00 +0000
commit412733b123b4b904952b649c8c4650a44b50db02 (patch)
treed1b285da81b10a7fd718fe9e5d19afd8c6006121 /libs/rs/rsg_ScriptJavaClass.cpp
parent01f6702064b02fe596206bc0614c46d6faa4aaff (diff)
parentb1a657cf7b902ecd4f86d7c1c160d28f4b38dbca (diff)
Merge "Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: 7fbce095b3 am: 8a6442ece9" into rvc-qpr-dev-plus-aosp am: b1a657cf7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440 Change-Id: I7ba38a32e1fcfc8d6ee8316eba230e663cc5895f
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions