Rubin Xu 55a05e4d35 am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev ...

* commit 'b90a2f9d1a58586ef8215176bae22ac6dc4eaee3':
  String literals for CL ag/586597

2014-11-21 17:54:26 +00:00

..

java

am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev

2014-11-21 17:49:34 +00:00

jni

Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev

2014-11-19 23:55:52 +00:00

res

am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev

2014-11-21 17:54:26 +00:00

tests

Fix wifi reconnection tests.

2014-11-20 12:32:58 -08:00