Zhijun He 25bb60e844 Merge "Camera2: replace AssertionError with error log"

2014-05-02 18:45:06 +00:00

..

java

Merge "Camera2: replace AssertionError with error log"

2014-05-02 18:45:06 +00:00

jni

Merge "fix AudioTrack and AudioRecord JNI"

2014-05-01 23:49:51 +00:00

res

am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev

2014-05-02 17:33:48 +00:00

tests

Merge "API for network cache subsystems."

2014-05-02 15:33:36 +00:00