aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java
Commit message (Expand)AuthorAge
* Clean up code that directly imports nested classes like Builder, Entry, etc.Gravatar jcater2018-05-01
* Automated rollback of commit f672a31b8b19baab95373e4f2f6d110aa8b8f0fb.Gravatar corysmith2018-02-16
* Normalized the serialization proto to save space and allow greater versatilit...Gravatar corysmith2018-02-16
* Replace truth.FailureStrategy with truth.FailureMetadata in bazel's Subjects.Gravatar Googler2017-11-10
* Automated rollback of commit 3181c2f1362622985aca24747ed9512573d25dc0.Gravatar corysmith2017-11-06
* Simplify the merge code, and fix a few incorrectly declared tests.Gravatar corysmith2017-11-06
* Add flag to turn Android resource merge conflicts from warnings into errorsGravatar Googler2017-07-14
* Fix bug where merge conflicts for resources defined in XML with equal values ...Gravatar Googler2017-07-13
* DataSource FixesGravatar Googler2017-03-28
* Open source some Android tools' tests.Gravatar Adam Michael2017-03-23