diff options
| author | Dmitry Dementyev <dementyev@google.com> | 2017-03-08 16:32:00 -0800 |
|---|---|---|
| committer | Harry Youd <harry@harryyoud.co.uk> | 2017-07-11 08:14:58 +0000 |
| commit | c3f2df12fc2cd2b0bcab871cd83f16cf59771af0 (patch) | |
| tree | 0fcbcad6d593defaca77b21efdb008d7748b3c45 /res/values-ast-rES/arrays.xml | |
| parent | 1347ed5917a6e01695b0be28b756a0870ebdcf3d (diff) | |
| download | packages_apps_Settings-c3f2df12fc2cd2b0bcab871cd83f16cf59771af0.tar.gz packages_apps_Settings-c3f2df12fc2cd2b0bcab871cd83f16cf59771af0.tar.bz2 packages_apps_Settings-c3f2df12fc2cd2b0bcab871cd83f16cf59771af0.zip | |
resolve merge conflicts of 3964c51bf2 to nyc-dev
Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
AOSP-Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
(cherry picked from commit 0f04a5a93f846d6f2d528ab6ae0c9e37d701e438)
CVE-2017-0703
Change-Id: I6c09d8069b84661f761b385c8806bbe48aca155e
Diffstat (limited to 'res/values-ast-rES/arrays.xml')
0 files changed, 0 insertions, 0 deletions