summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-05-09 17:19:33 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-09 17:19:33 -0700
commita9d767b38f3ec0530f3c89d0448225ef9181062c (patch)
tree6a55c98cad11a39418aab4ae5a6ddb4c71186d6d
parent90270170724d81013825feeac8f80fd89595388c (diff)
parentaca632ef301d91a75f4348bdd8957c6899ff4c7e (diff)
downloadam57x-a9d767b38f3ec0530f3c89d0448225ef9181062c.tar.gz
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 4d0432b5b2 -s ours
am: aca632ef30 -s ours am skip reason: subject contains skip directive Change-Id: I44e814975322a4f4423ed6007e956bac48925f9d
0 files changed, 0 insertions, 0 deletions