Dianne Hackborn e5ef988768 am 8b5944b7: am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1 ...

* commit '8b5944b75babfcbd52abeac927430165c7d343c6':
  Remove fade animations from framework drawables.

2012-03-15 11:32:35 -07:00

..

java

Merge "Do not allow Surface creation on machines without SurfaceFlinger We will fail later anyways, but this change makes it much easier to track down places where we are inadvertently doing operations that depend on the flinger." into ics-aah-exp

2012-03-09 12:40:51 -08:00

jni

am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1

2012-01-13 13:12:41 -08:00

res

am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1

2012-03-15 11:29:24 -07:00

tests

am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1

2012-03-01 17:07:38 -08:00