summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-03-12 22:55:53 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-12 22:55:53 -0700
commitafef848f2ebf7c618bd07fed3461b92133c3d418 (patch)
tree04f803d58c774184ca561362881320ce1b9c760d
parent43beb634d3650e8f51e5fe375d3addb04e3e9af1 (diff)
parentd6f6a768f6b5c343812d034168878e078dff10c4 (diff)
downloadmarlin-kernel-afef848f2ebf7c618bd07fed3461b92133c3d418.tar.gz
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 38ba06836d -s ours am: 76e9337a78 -s ours
am: d6f6a768f6 -s ours am skip reason: subject contains skip directive Change-Id: I416517e746f31628238982ff9d31c6870cdf2485
0 files changed, 0 insertions, 0 deletions