tree 8061631e3ba5cfe49d1aa63b1f3bdf6e37bcac08
parent 3b871af0b44f74a62c2ad60c52a106e39fadef42
parent bf7f53e29d8cb1de4d4b028002d3e157d89cbfe3
author Derek Tan <derektan@google.com> 1409962708 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409962708 +0000

am de6fefb4: Merge "Update the preferred network type APIs." into lmp-dev

* commit 'de6fefb4f5e9da6aedc600abd7c10d14398b47c7':
  Update the preferred network type APIs.