Erik Kline 30246e3d37 am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev ...

automerge: dedd42a

* commit 'dedd42a2bdfafd6195d793949766d1c53f80ae51':
  Rename EXTRA_NETWORK ConnectivityManager constants.

2014-11-21 02:57:09 +00:00

..

java

am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev

2014-11-21 02:57:09 +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