32555e832a
Conflicts: java/res/values-da/strings.xml java/res/values-es-rUS/strings.xml java/res/values-fa/strings.xml java/res/values-ko/strings.xml java/res/values-pl/strings.xml java/res/values-sk/strings.xml java/res/values-sw/strings.xml Change-Id: I1d4be3df6c54c328011c448f31f163fafb2a909a |
||
---|---|---|
dictionaries | ||
java | ||
native | ||
tests | ||
tools | ||
Android.mk | ||
CleanSpec.mk |