Commits
Neil Fuller authored and Android Git Automerger committed 4cdb25211caM
am 1913dc11: resolved conflicts for merge of 71165ea6 to mnc-dr-dev-plus-aosp * commit '1913dc11b1bd6d23a13949f9bfa34ca3029d90a8': Migrate Resources.java to use ICU4j drectly.
Showing diff to3a6b452ef11