aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-04-10 04:27:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-10 04:27:45 +0000
commit985565f36200f8d44f79890f6bcb1f163fde7150 (patch)
tree1d4aa70419bdf0720350c7d1b3cdf111d04cc025
parent7bd5ce3e1430ae415d61a20548561b2092a9fe51 (diff)
parentbd140dcfaeb5bbe184aa289197c7ea08b5412be8 (diff)
downloadgoogle-styleguide-985565f36200f8d44f79890f6bcb1f163fde7150.tar.gz
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d7bdb508ed -s ours am: e7fe683339 am: 276d6dffe0 am: bd140dcfae -s ours
am skip reason: subject contains skip directive Change-Id: I319631af2ac36749d3537f25ec7cdfa34adb09e7
0 files changed, 0 insertions, 0 deletions