tree 32d6009f9227ad7f47f06da604e714057364b661
parent f78c50e6dae1dd760ccf2dcba60673fa74a36c86
parent ec3e9805dd7c527f961d1f2a14e5752b461186ca
author Wink Saville <wink@google.com> 1415809480 -0800
committer Wink Saville <wink@google.com> 1415809480 -0800

Merge commit 'ec3e9805dd7c527f961d1f2a14e5752b461186ca' into fix-merge-conflict

Conflicts:
	wifi/java/android/net/wifi/WifiConfiguration.java

Change-Id: If52be614cadf80955025097589f922072363e7ba