summaryrefslogtreecommitdiff
path: root/tools/aidl/generate_java.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-04-30 16:31:36 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-04-30 16:31:36 -0700
commit68b37c06787890095a6bb31ea168db4edc942b05 (patch)
tree89aa75f6ac951a65b42f353aa882748752ecf240 /tools/aidl/generate_java.cpp
parent4e581da55f32093bf8f1910e04f9a8f0aa79951b (diff)
parentc0013a2196715342976b9ff5ff0bb64e9f2cb86e (diff)
[automerger skipped] Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev am: 0a7c41615e am: 4e0dd1197a am: d9fb6e1236 -s ours am: 9411ab1589 -s ours
am: c0013a2196 -s ours Change-Id: Ie350fe3eb0ab788a6221be0267a186b891591248
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions