| commit | 4cdb25211cae22c001eaf1f3f2df6cbc932fb558 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Jul 17 10:57:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 17 10:57:57 2015 +0000 |
| tree | a4a57b3801a8d225106806c83565fd15c3e4304e | |
| parent | 3a6b452ef11c0b6be6a6793f5441c155bfe69a40 [diff] | |
| parent | 1913dc11b1bd6d23a13949f9bfa34ca3029d90a8 [diff] |
am 1913dc11: resolved conflicts for merge of 71165ea6 to mnc-dr-dev-plus-aosp * commit '1913dc11b1bd6d23a13949f9bfa34ca3029d90a8': Migrate Resources.java to use ICU4j drectly.