summaryrefslogtreecommitdiff
path: root/libs/rs/rsg_ScriptJavaClass.cpp
diff options
context:
space:
mode:
authorjunyulai <junyulai@google.com>2019-05-20 22:57:54 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-20 22:57:54 -0700
commitc40922354f2563db84614a3c2d1188d9da42077c (patch)
tree29bda5922c9e707abf55acf4453d63e1d178dae5 /libs/rs/rsg_ScriptJavaClass.cpp
parent0665f87c7ef4791135f4412a312d660e2c435686 (diff)
parentb28aa2636de54688fe655bff16d1996435a47625 (diff)
Merge "Move keepalive constants to their right place" am: 236b96f327 am: 292f73b0dc
am: b28aa2636d Change-Id: I4dcbf65c8b778815eef748ee348c928a258d40e0
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions