destradaa 08f15963fe Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906"

2014-04-25 21:21:37 +00:00

..

java

Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906"

2014-04-25 21:21:37 +00:00

jni

Merge "Fix nativeGetAnimationFrameStats to use the correct times."

2014-04-25 16:59:21 +00:00

res

Merge "Introduce condition provider services."

2014-04-25 18:19:06 +00:00

tests

Allow prefix-based Uri permission grants.

2014-04-22 21:06:49 -07:00