Qiwen Zhao f3797327f9 Merge branch 'master-nova' of persistent-https://googleplex-android.googlesource.com/platform/frameworks/base into master-nova

2014-02-11 10:59:34 -08:00

..

java

am 9b6fa775: Merge "Implement missing safelyRun() on ThreadedRenderer"

2014-02-11 10:58:59 -08:00

jni

Merge branch 'master-nova' of persistent-https://googleplex-android.googlesource.com/platform/frameworks/base into master-nova

2014-02-11 10:59:34 -08:00

res

am f0af5757: Merge "Improve idle-service bind permission description"

2014-02-05 14:05:59 -08:00

tests

Update DrmOutputStream to use raw FileDescriptor.

2014-02-06 09:47:38 -08:00