Robin Lee 26e2da8ff8 am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev ...

* commit '374c358dd201583771b7aa391c56618548f543a6':
  Profile owner hint in warning for extra CAs

2015-01-07 12:36:11 +00:00

..

java

am a517e81e: Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev

2015-01-07 01:17:32 +00:00

jni

fix Uss accounting in getPssPid()

2014-12-12 00:20:24 +00:00

res

Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev

2015-01-07 12:30:57 +00:00

tests

Sanitize display names, keep extensions intact.

2014-12-01 09:38:49 -08:00