Chet Haase ea3b4506f3 am 8b575ec3: am c05c3628: Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev ...

* commit '8b575ec3a733d5e08b0fc9ce995d2aa2148f47a6':
  Ensure that transitions animating alpha end on a reasonable value

2013-09-16 14:08:26 -07:00

..

java

am 8b575ec3: am c05c3628: Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev

2013-09-16 14:08:26 -07:00

jni

am 3b8a7a04: am b693ef60: Merge "Do not allocate so much memory on the stack." into klp-dev

2013-09-16 10:45:01 -07:00

res

am c1c5e117: am 311daf20: Merge "New platlogo for K." into klp-dev

2013-09-16 13:14:00 -07:00

tests

am 14297141: am 5cf86aa7: Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev

2013-09-16 14:08:23 -07:00