tree 5726f10dfb79a4b4d4ae744ebd2b985b6335ab26
parent 83fb64e8ec4c6bc0930f50b24bd1c36a81f6a1c2
parent 90e9307e8fa713081aeccd8f5f212c0f1255bd07
author Erik Kline <ek@google.com> 1416528260 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416528263 +0000

Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev