Google Git
Sign in
android / platform / packages / apps / Settings / ee06524dbef64e43dbab6690a088a6913653a1a4
commitee06524dbef64e43dbab6690a088a6913653a1a4[log] [tgz]
authorXin Li <delphij@google.com>Thu Dec 10 03:05:02 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Dec 10 03:05:02 2020 +0000
treee12e6e5e66a18e52ea2e8e59704ef76db7e1371f
parent07ccb42665a87d98b499fda6f1472ab2e8ebf9dc [diff]
parent6e252c4cd5dc6a3d3ecd459f44cf1f0156538b68 [diff]
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5 -s ours

am skip reason: Change-Id Id2d9c4f56beae280e6299b6695185577a1521345 with SHA-1 07ccb42665 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1521297

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e2389a3b1ff505dc0a8cc84b1d9b21dd7f6c01b
tree: e12e6e5e66a18e52ea2e8e59704ef76db7e1371f
  1. libs/
  2. protos/
  3. res/
  4. src/
  5. tests/
  6. .gitignore
  7. Android.bp
  8. AndroidManifest.xml
  9. CleanSpec.mk
  10. color-check-baseline.xml
  11. NOTICE
  12. OWNERS
  13. PREUPLOAD.cfg
  14. proguard.flags
  15. TEST_MAPPING
  16. wrap_alpha.py