John Spurlock ff1005a6f5 am 7745fb9e: Merge "Introduce condition provider services." ...

* commit '7745fb9e95b6938591a46ffcaace8db02c93962f':
  Introduce condition provider services.

2014-04-25 18:21:40 +00:00

..

java

am 7745fb9e: Merge "Introduce condition provider services."

2014-04-25 18:21:40 +00:00

jni

Merge "Fix nativeGetAnimationFrameStats to use the correct times."

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

res

am 7745fb9e: Merge "Introduce condition provider services."

2014-04-25 18:21:40 +00:00

tests

Allow prefix-based Uri permission grants.

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