am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev

* commit '20be0e25ba660a7555577988cefcfa36d84e7e2f':
  Update Javadoc for EXTRA_NETWORK.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base