summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-02-20 09:15:43 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-20 09:15:43 -0800
commit1f164c0f3b5b3880c75da171980eee30f8ecc62d (patch)
treeb8d42f2e9c3d4aa9475411ab747c8169c78c7b96
parent64092738e3dbd5f1d44208afdd549935728ff700 (diff)
parent5ba10681a928f02beee2863218b1db2b64375719 (diff)
downloadmarlin-kernel-1f164c0f3b5b3880c75da171980eee30f8ecc62d.tar.gz
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 1332a68542 -s ours
am: 5ba10681a9 -s ours am skip reason: subject contains skip directive Change-Id: I935dee3ddd65d33dd255f05c4761ca77c891c146
0 files changed, 0 insertions, 0 deletions