summaryrefslogtreecommitdiff
path: root/tools/aidl/generate_java.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-24 02:30:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-24 02:30:28 +0000
commitb5e78021be39ec98edd6c84f876571e91145ef44 (patch)
treebc8ddc94871fd410f050dced326917f2ee35e0ee /tools/aidl/generate_java.cpp
parent31cbb3e62a2c126a078471ec909ddb3157a92480 (diff)
parenta11ca98f30c4463f00493e70ed35f43663391af6 (diff)
Merge "Merge "Conserve activity flag after notif update" into rvc-dev am: 0d8689233d am: 93cf1840ab" into rvc-d1-dev-plus-aosp am: a11ca98f30
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11964769 Change-Id: I24f8c7f8b464a21796e24674ded7eb3d763986b2
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions