Irfan Sheriff 6ad0da54a8 am 74f4997c: am 5d4206a5: Merge "Get strings in" into jb-mr1-dev ...

* commit '74f4997ca467bda930e1c270f82731e66666999c':
  Get strings in

2012-09-19 15:19:08 -07:00

..

java

am 74f4997c: am 5d4206a5: Merge "Get strings in" into jb-mr1-dev

2012-09-19 15:19:08 -07:00

jni

Fix Skia assertions where we were allowing immutable bitmaps to be written to.

2012-09-19 07:21:12 -07:00

res

am 74f4997c: am 5d4206a5: Merge "Get strings in" into jb-mr1-dev

2012-09-19 15:19:08 -07:00

tests

Code cleanup for X509TrustManagerExtensionsTest.java

2012-09-18 14:44:54 -07:00