Narayan Kamath 8dd41fb992 Merge "Don't wait indefinitely for audio tracks to finish playing."

2011-09-14 09:11:17 -07:00

..

java

Merge "Don't wait indefinitely for audio tracks to finish playing."

2011-09-14 09:11:17 -07:00

jni

Fix a compile error when debug is turned on

2011-09-12 18:25:31 -07:00

res

Merge "Moving tablet unlock screen assets to tablet-specific folders Refreshing visual style to match phone unlock assets Bug: 5231253"

2011-09-14 07:39:56 -07:00

tests

Merge "Add verifier device identity"

2011-09-13 17:51:08 -07:00