Ching Tzung Lin a93d871e5c Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev am: 7f54aa1e81 am: 9c7f6a409b ...

am: 7078a44687

* commit '7078a446874bdb2a51b9eae8b41f9d1ec0bce86a':
  Remove circular_display_mask_offset symbol and default

2015-11-03 22:28:49 +00:00

..

java

Merge "Un-hide FloatProperty and IntProperty"

2015-11-03 22:16:14 +00:00

jni

Assume OpenGL ES 2.0 support for qemu.gles > 0

2015-11-03 17:18:35 -05:00

res

Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev am: 7f54aa1e81 am: 9c7f6a409b

2015-11-03 22:28:49 +00:00

tests

Merge "Fix failing TextActivityTest."

2015-11-03 16:06:38 +00:00