vandwalle dca701a8fa am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev ...

automerge: 76dc7a1

* commit '76dc7a1abe2d69013dbc8238292d239ac1287e2c':
  adjust network switching thresholds Bug:18589301

2014-12-11 03:41:48 +00:00

..

java

am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev

2014-12-11 02:10:23 +00:00

jni

resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

2014-12-10 10:42:08 -08:00

res

am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev

2014-12-11 03:41:48 +00:00

tests

am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev

2014-12-01 20:00:32 +00:00