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

automerge: 23bb3f1

* commit '23bb3f11cbe4ca64337b5b75c333ea891760213f':
  Profile owner hint in warning for extra CAs

2015-01-07 12:43:41 +00:00

..

java

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

2015-01-07 01:49:31 +00:00

jni

am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."

2015-01-07 10:32:50 +00:00

res

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

2015-01-07 12:43:41 +00:00

tests

am 93241de7: Merge "Remove a bitrotted test." automerge: ba6982a

2014-12-18 02:42:27 +00:00