diff options
| author | Nick Kralevich <nnk@google.com> | 2014-02-12 11:05:59 -0800 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2014-02-12 11:05:59 -0800 |
| commit | dd3d95f182a634acdcc1b1e8e4954234d048eb54 (patch) | |
| tree | 989ee8d51a833038825dc36d38c9bdc7d1463917 /core/res | |
| parent | aa318b2851042c6f98723446f33469a6545c7294 (diff) | |
| parent | 4ad93639d210297764db3ffcd870ff38464943de (diff) | |
| download | frameworks_base-dd3d95f182a634acdcc1b1e8e4954234d048eb54.zip frameworks_base-dd3d95f182a634acdcc1b1e8e4954234d048eb54.tar.gz frameworks_base-dd3d95f182a634acdcc1b1e8e4954234d048eb54.tar.bz2 | |
resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp
Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index b20f5ba..4647413 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1777,6 +1777,16 @@ <attr name="publicKey" /> </declare-styleable> + <!-- Attributes relating to resource overlay packages. --> + <declare-styleable name="AndroidManifestResourceOverlay" parent="AndroidManifest"> + <!-- Package name of base package whose resources will be overlaid. --> + <attr name="targetPackage" /> + + <!-- Load order of overlay package. --> + <attr name="priority" /> + + </declare-styleable> + <!-- Declaration of an {@link android.content.Intent} object in XML. May also include zero or more {@link #IntentCategory <category> and {@link #Extra <extra>} tags. --> |