vandwalle 0a22d43c91 Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev ...

automerge: d169839

* commit 'd1698393e71f4792f98156bb963e5876bc8c2eb0':
  aggressively blacklist WifiConfiguration for the purpose of switching network

2015-01-29 04:57:00 +00:00

..

java

Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev

2015-01-28 23:22:56 +00:00

jni

Handle bad ninepatch data.

2015-01-27 16:41:16 +00:00

res

Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev

2015-01-29 04:57:00 +00:00

tests

…