3.73 of 5: Convert xml parsing to use the map based storage

Introduces two new interfaces:
  DataValue, which compliments DataKey and allows a cleaner interface MergeConflict
  AndroidDataSet.KeyValueConsumer, abstraction that allows a common interface for consuming parsed resources, which is a lot cleanr for DataValue as well.

--
MOS_MIGRATED_REVID=118466739

1 files changed, 2 insertions, 0 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
index 613884ded9..df6d9ab8f8 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
@@ -32,6 +32,7 @@ import java.util.Set;
  * Handles the Merging of AndroidDataSet.
  */
 public class AndroidDataMerger {
+
   /**
    * Merges DataResources into an UnwrittenMergedAndroidData.
    *
@@ -176,6 +177,7 @@ public class AndroidDataMerger {
       }
       throw new MergingException(Joiner.on("\n").join(messages));
     }
+
     return UnwrittenMergedAndroidData.of(
         primaryData.getManifest(),
         primary,