Kenny Guy 58b305bb00 am 0ec41abf: Merge "Provide access to ActivityInfo.name from LauncherActivityInfo" ...

* commit '0ec41abf20df9c27cd995b8ca22fa709aff4434b':
  Provide access to ActivityInfo.name from LauncherActivityInfo

2014-04-25 20:33:55 +00:00

..

java

am 0ec41abf: Merge "Provide access to ActivityInfo.name from LauncherActivityInfo"

2014-04-25 20:33:55 +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