Jeff Sharkey f1301d86fb Merge commit 'b3f66877' into afdmerge ...

Change-Id: I319863cf23b2e6eacfa4508f7b111fba7b1cbc24

2013-04-29 15:29:13 -07:00

..

java

Merge commit 'b3f66877' into afdmerge

2013-04-29 15:29:13 -07:00

jni

Merge "Regenerate GL stubs"

2013-04-29 18:22:37 +00:00

res

Add keyguard background scrim and protection around keyguard APIs

2013-04-26 14:34:21 -07:00

tests

Make download manager tests more reliable.

2013-04-09 15:08:43 -07:00