summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-02-20 12:14:37 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-20 12:14:37 -0800
commit46e42683794f1069ab3bd556c2dd9887c33a00b6 (patch)
treef52bd099f09d85a0ee2e2e56426774e56eea86bf
parentd2c3fe558af3d70429909018a524957651847f59 (diff)
parentea776127e73f4b3ee867acd1e05a05e67a98dc9b (diff)
downloadandroid_packages_apps_Camera2-46e42683794f1069ab3bd556c2dd9887c33a00b6.tar.gz
android_packages_apps_Camera2-46e42683794f1069ab3bd556c2dd9887c33a00b6.tar.bz2
android_packages_apps_Camera2-46e42683794f1069ab3bd556c2dd9887c33a00b6.zip
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: 4e1e510484 -s ours am: c4b4530843 -s ours
am: ea776127e7 -s ours am skip reason: subject contains skip directive Change-Id: I2774e749a226b4fce39602e19496c52c03a07c13
0 files changed, 0 insertions, 0 deletions