Adam Powell 7962fd36fc am d1f13586: am 10bd4106: am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" ...

* commit 'd1f135869e1e89348ea9d1ee916749e30933fe7f':
  Implement resolving of icon attributes to resIds in AlertController

2012-09-19 15:21:04 -07:00

..

java

am d1f13586: am 10bd4106: am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"

2012-09-19 15:21:04 -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