Alexandra Gherghina 94f24069e2 am e255d739: Merge "Modify getUserProfiles to return only enabled profiles:" ...

* commit 'e255d7399f46de4b4e3d94b95b26df3408274394':
  Modify getUserProfiles to return only enabled profiles:

2014-04-24 15:25:58 +00:00

..

java

am e255d739: Merge "Modify getUserProfiles to return only enabled profiles:"

2014-04-24 15:25:58 +00:00

jni

Merge "Bug fix for wakeup sensors."

2014-04-24 00:40:59 +00:00

res

Import translations. DO NOT MERGE

2014-04-23 11:53:59 -07:00

tests

Allow prefix-based Uri permission grants.

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