7ba319e - platform/packages/apps/Settings

commit: 7ba319e7e80e1ee04c18b6bf75c416c34f450f12
[log]
author: Adam Seaton <aseaton@google.com>
Thu Oct 26 20:59:57 2017 -0700
committer: android-build-team Robot <android-build-team-robot@google.com>
Fri Oct 27 04:05:13 2017 +0000
tree: 2ec51fffcfca47e16bc5249e50e18116c8cc9e3a
parent: 9cfebe36e6429ce477da209eaaba8d23d72679ea [diff]

Fix hi strings after bad merge conflict fix: November EMR
(cherry picked from commit bccc819cab8883800bc273ce22f74e94f18a5a2e)

Change-Id: Ie8c17f403acd8538db00cea18dcfc870d490df84

res/values-hi/strings.xml[diff]

1 file changed

tree: 2ec51fffcfca47e16bc5249e50e18116c8cc9e3a

res/
src/
tests/
Android.mk
AndroidManifest.xml
CleanSpec.mk
MODULE_LICENSE_APACHE2
NOTICE
PREUPLOAD.cfg
proguard.flags
wrap_alpha.py