Mark Salyzyn 95df2024ed am a19b9c41: am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors" ...

* commit 'a19b9c413b3e7f3b6038b06c51d01bab1e0bfda9':
  EventLog: event log translation errors

2014-04-25 22:52:09 +00:00

..

java

am a19b9c41: am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors"

2014-04-25 22:52:09 +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