John Wang 196c215a8b am 6504d74b: am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1 ...

* commit '6504d74b8f7b98f7c2d5fb550042c644510d5f34':
  [maguro] Fix STK issues

2011-11-14 12:14:09 -08:00

..

java

am a16ee939: am 28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1

2011-11-14 07:49:07 -08:00

jni

am 738d8cae: am c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1

2011-11-14 11:54:38 -08:00

res

am 6504d74b: am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1

2011-11-14 12:14:09 -08:00

tests

Merge "Adding mobile microbenchmark tests."

2011-11-10 08:16:04 -08:00