Andreas Gampe b6d6c04a71 am 174a4488: am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd" ...

* commit '174a44888ec56f688426c80d50b9e0021f47c16f':
  Frameworks/base: Pass APK debugability to installd

2015-03-10 15:11:56 +00:00

..

java

am 174a4488: am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd"

2015-03-10 15:11:56 +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