Amith Yamasani 9c316f3c6a am d49ec62c: am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1 ...

* commit 'd49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7':
  New and improved silent mode on lockscreen.

2011-12-06 16:59:44 -08:00

..

java

Merge "resolved conflicts for merge of 6a828712 to master"

2011-12-06 16:57:35 -08:00

jni

Discard framebuffer rendering queues when discarding layers

2011-12-06 16:37:10 -08:00

res

am d49ec62c: am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1

2011-12-06 16:59:44 -08:00

tests

am 96f660f4: am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

2011-12-05 16:32:59 -08:00