Alan Viverette ea28d4594d am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev ...

automerge: 9eb4ee24

* commit '9eb4ee244beb124c0e81d73126376ec8350984c6':
  Make DeviceDefault alert dialog themes public

2014-11-21 02:58:24 +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 e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev

2014-11-21 02:58:24 +00:00

tests

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

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