summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2019-03-11 16:10:03 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-11 16:10:03 -0700
commita48f7c0981b9979ef7b060610071b71a5f019878 (patch)
tree487b3ee51036ba0da44a72b25358a1631f7f06f6
parente87e15f60fcb16a83df30ccbbbc62943ef6f1e10 (diff)
parent4e7cce916984c5d067634e4e62bde52562af5478 (diff)
downloadsecurity-a48f7c0981b9979ef7b060610071b71a5f019878.tar.gz
[automerger skipped] Merge "DO NOT MERGE - Skip PPRL.190305.001 into master" am: eb7b084d60 -s ours
am: 4e7cce9169 -s ours am skip reason: subject contains skip directive Change-Id: If507cb39c7a2f512cc6aabc1a4fc58344beccc73
0 files changed, 0 insertions, 0 deletions