Adam Powell 56fd88d87f am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" ...

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

2012-09-19 11:56:40 -07:00

..

java

am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"

2012-09-19 11:56:40 -07:00

jni

am f4afc401: Merge "framework: fix bug for uninitialized variable"

2012-09-14 12:15:03 -07:00

res

am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"

2012-09-05 12:10:44 -07:00

tests

am a950daf5: Merge changes Ieb566a2a,I953057cd

2012-08-16 16:33:40 -07:00