summaryrefslogtreecommitdiff
path: root/framework/java/android
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-01-08 09:57:42 -0800
committerandroid-build-merger <android-build-merger@google.com>2020-01-08 09:57:42 -0800
commitf723651e8625d0fa247ab98e53659ecde028c00c (patch)
tree0a67956bcf1703a734f520db39887637595604bd /framework/java/android
parent7a6b019048d2f9de1901cc1c78d09b26a0841198 (diff)
parent77f923710576a0b6a5d597616545a0519b4cb71b (diff)
Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
am: 77f9237105 Change-Id: I4d10705027866ea946f5529166dd6f67aec9e332
Diffstat (limited to 'framework/java/android')
0 files changed, 0 insertions, 0 deletions