diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-04-25 22:00:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-25 22:00:13 +0000 |
| commit | b6ca2e809142aff71b7a574d478389cfc903d30b (patch) | |
| tree | c38ae2f58cb39e4e17be37e8eec2fe040b4b6436 /ui/res/values-fa/strings.xml | |
| parent | 21462c63d5c903fe35cd232bc4de4b6201f77c35 (diff) | |
| parent | a684e4d8de994ae1218e027655dffa2083165042 (diff) | |
| download | android_packages_providers_DownloadProvider-b6ca2e809142aff71b7a574d478389cfc903d30b.tar.gz android_packages_providers_DownloadProvider-b6ca2e809142aff71b7a574d478389cfc903d30b.tar.bz2 android_packages_providers_DownloadProvider-b6ca2e809142aff71b7a574d478389cfc903d30b.zip | |
Merge "resolve merge conflicts of cf5b0f5 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am: a684e4d
* commit 'a684e4d8de994ae1218e027655dffa2083165042':
Change-Id: I0416d5d54df2eb11e2ebdfa2125363085049bbff
Diffstat (limited to 'ui/res/values-fa/strings.xml')
0 files changed, 0 insertions, 0 deletions