summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-02-25 16:09:51 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-25 16:09:51 -0800
commitacf950dee8b3692d45c6b1de3092e6b2a18b69ae (patch)
tree23ce23bd71cd6b8a275abeeb1f93664196cda9c2
parenta72bcd97b43baa2b616c39e633e32474f761373b (diff)
parent6773473d84bc2d9c6a888535bf317521c3c0f4ab (diff)
downloadtaimen-acf950dee8b3692d45c6b1de3092e6b2a18b69ae.tar.gz
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 6773473d84 -s ours am skip reason: subject contains skip directive Change-Id: I056bacb3c289909e4056cbfc43523094c811f7e2
0 files changed, 0 insertions, 0 deletions