index
:
bazel
master
a fast, scalable, multi-language and extensible build system
about
summary
refs
log
tree
commit
diff
homepage
log msg
author
committer
range
path:
root
/
src
/
tools
/
android
/
java
/
com
/
google
/
devtools
/
build
/
android
/
MergeConflict.java
Commit message (
Expand
)
Author
Age
*
Automatic formatting cleanup of Android *.java files.
jingwen
2017-12-18
*
Fix bug where merge conflicts for resources defined in XML with equal values ...
Googler
2017-07-13
*
Improve the error message for simple values by including the value.
Googler
2017-03-31
*
DataSource Fixes
Googler
2017-03-28
*
unknown commit of 5: Fixing the merge warning messages in transitive library ...
Googler
2016-12-01
*
Fix target info in conflict error message, to avoid toString on objects
Googler
2016-11-04
*
MergeConflict: fix typo in error message string.
Googler
2016-07-29
*
Minor backwards compatibility fixes:
Googler
2016-07-21
*
4.95 of 5: Merger changes
Googler
2016-05-05
*
3.74 of 5: Remove DataKey from DataValue, FileDataResource and XmlDataResource.
Googler
2016-03-30
*
3.73 of 5: Convert xml parsing to use the map based storage
Googler
2016-03-30
*
3.71: Remove ResourceMap, Fix tests
Googler
2016-03-25
*
Part 3.5 of 5: Assets
Googler
2016-03-25
*
Part 3 of 5: Merging semantics.
Googler
2016-03-18