OSDN Git Service

am c581c3da: (-s ours) am 42a0114c: Merge "Changes in framework for WIFI_CREDENTIAL_C...
authorChelsea Derrick <chelsead@google.com>
Thu, 17 Jul 2014 18:25:24 +0000 (18:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 18:25:24 +0000 (18:25 +0000)
commita0e20d2d51c5b6b24df362a86acdd35cad1ba04a
tree56d7a1958ea12893c0298323085141f0e07928ae
parente0ac41446f97de7bceff94a51fc5e89f71a792e5
parent116073926da22ea0312257139ae3cf85d6da80bb
am c581c3da: (-s ours) am 42a0114c: Merge "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]" into lmp-dev

* commit 'c581c3dac2f576dc0301826c04a1761b01bd26ac':