Jean-Baptiste Queru 276bb3a327 am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp ...

Merge commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342'

* commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342':
  Make disabled TextViews uneditable

2010-10-21 13:47:42 -07:00

..

config

…

java

am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp

2010-10-21 13:47:42 -07:00

jni

Merge "Optimizing display lists by referencing pointers to resources instead of copying them"

2010-10-21 13:29:26 -07:00

res

Refactor SystemUI so the status bar isn't a Service of its own.

2010-10-21 15:42:34 -04:00

tests

Add AsyncChannel and AsyncService.

2010-10-20 15:17:28 -07:00