tree fe1267b0ba8d3157a01ba7498ad746c979ea8029
parent a6bc312966b7d1c6b46e99f4c1be9b20188684ab
parent 26154141cad2f0016f0af3ed3da79397cc4da0d3
author Andrew Lee <anwlee@google.com> 1424903259 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1424903259 +0000

Merge "Set CAPABILITY_WIFI on TelephonyConnection." into lmp-mr1-wfc-dev