Nick Kralevich 643be3bab1 am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels." ...

* commit '3dfa15c49b4c78cdf3bf1af79e9b307596455708':
  Map SELinux log levels to Android log levels.

2014-01-31 10:26:32 +00:00

..

java

Merge "Add proxy as another network." into klp-modular-dev

2014-01-30 22:58:48 +00:00

jni

am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels."

2014-01-31 10:26:32 +00:00

res

Make MANAGE_ACTIVITY_STACKS a signature|system permission.

2014-01-26 21:58:51 -08:00

tests

XmlUtils#readThisMapXml should handle null keys.

2014-01-06 11:18:21 +00:00