Erik Kline 398bd1e774 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/android/net

Rename EXTRA_NETWORK ConnectivityManager constants.

2014-11-20 13:16:31 +09:00

jni

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

tests/coretests

Treat optimistic addresses as global preferred.

2014-10-29 19:11:58 +09:00