diff options
author | Linus Tufvesson <lus@google.com> | 2020-04-02 13:47:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-02 13:47:05 +0000 |
commit | 03d66b424101f102e451b584c98cab69cf37abb8 (patch) | |
tree | d74813be19c0aca851ac5051ccaf5704473f3786 /packages/SettingsLib/res/values-eu/strings.xml | |
parent | 04897a9bbd6ef7033b798ecb2e76dabd06944993 (diff) | |
parent | 0b232439351c073772b88542ceb551ce9c3b9404 (diff) | |
download | frameworks_base-03d66b424101f102e451b584c98cab69cf37abb8.tar.gz frameworks_base-03d66b424101f102e451b584c98cab69cf37abb8.tar.bz2 frameworks_base-03d66b424101f102e451b584c98cab69cf37abb8.zip |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am: 0b23243935 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia127db655eda161e6bb8ee6ae22374e38b7bcefd
Diffstat (limited to 'packages/SettingsLib/res/values-eu/strings.xml')
0 files changed, 0 insertions, 0 deletions