Eino-Ville Talvala 1432a40ff3 am df84cb90: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev ...

automerge: b22de13

* commit 'b22de13fdb195716006b8e9b03f52d3ab60aecd5':
  Camera: Add one more requirement to BURST_CAPTURE

2014-11-21 02:51:02 +00:00

..

java

am df84cb90: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev

2014-11-21 02:51:02 +00:00

jni

resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

2014-11-20 15:41:25 -08:00

res

am 05275a2c: am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev

2014-11-21 01:38:21 +00:00

tests

am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev

2014-11-21 02:43:06 +00:00