Elliott Hughes 7545accf1f am 6291bedd: am 63d43949: Merge "Use the icu:: namespace for icu4c API." ...

* commit '6291beddfcdf843f07f12a6d4551301e5fcff73c':
  Use the icu:: namespace for icu4c API.

2015-03-09 18:26:51 +00:00

..

java

am 55966006: am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"

2015-03-08 00:08:25 +00:00

jni

am 63d43949: Merge "Use the icu:: namespace for icu4c API."

2015-03-09 18:20:42 +00:00

res

am 8aeab6c8: Allow the keyguard service to be configurable.

2015-03-09 15:35:38 +00:00

tests

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00