Zhijun He 7db103bb2d am 7c358ce4: Merge "Camera2: replace AssertionError with error log" ...

* commit '7c358ce4a1961612ed5f644ec8827010db545dec':
  Camera2: replace AssertionError with error log

2014-05-02 18:50:07 +00:00

..

java

am 7c358ce4: Merge "Camera2: replace AssertionError with error log"

2014-05-02 18:50:07 +00:00

jni

Merge "fix AudioTrack and AudioRecord JNI"

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

res

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

2014-05-02 17:42:07 +00:00

tests

Merge "API for network cache subsystems."

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