summaryrefslogtreecommitdiffstats
path: root/core/tests
Commit message (Collapse)AuthorAgeFilesLines
* am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same ↵Adam Lesinski2014-11-131-0/+263
|\ | | | | | | | | | | | | concrete types among its elements." into lmp-mr1-dev * commit '648f81064747b58be7ea9efab6d5744d6b49397a': Fix ParceledListSlice to enforce the same concrete types among its elements.
| * Merge "Fix ParceledListSlice to enforce the same concrete types among its ↵Adam Lesinski2014-11-131-0/+263
| |\ | | | | | | | | | elements." into lmp-mr1-dev
| | * Fix ParceledListSlice to enforce the same concrete types among its elements.Adam Lesinski2014-11-121-0/+263
| | | | | | | | | | | | Bug:17671747 Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
* | | am a2781fda: am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with ↵Jeff Sharkey2014-11-121-0/+57
|\ \ \ | |/ / | | | | | | | | | | | | | | | malformed certificates. * commit 'a2781fdac332c4f6277a986c88e34daa25a3b5f9': Recover apps with malformed certificates.
| * | am 2e700004: am d68b87cd: Recover apps with malformed certificates.Jeff Sharkey2014-11-121-0/+57
| |\ \ | | |/ | |/| | | | | | | * commit '2e7000040e3d836bb591e29515974817afc49488': Recover apps with malformed certificates.
| | * Recover apps with malformed certificates.Jeff Sharkey2014-11-121-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a window of time in Lollipop where we persisted certificates after they had passed through a decode/encode cycle. The well-written OpenSSL library was liberal when decoding (allowing slightly malformed certs to be parsed), but then strict when encoding, giving us different bytes for effectively the same certificate. A related libcore change (0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b) now returns the original bytes verbatim, fixing both pre-Lollipop installs and installs after that change. This change recovers any apps that had been installed during the window of time described above by doing a one-time check to see if the certs are effectively equal. Bug: 18228011 Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d
* | | am 7c4ef052: Merge "Fix for CharSequenceCreator test case"Elliott Hughes2014-11-121-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * commit '7c4ef052d521d5ccf8acfb03c9332b59ea737cea': Fix for CharSequenceCreator test case
| * | | Fix for CharSequenceCreator test caseMattias Petersson2014-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test case testCharSequenceCreator() in TextUtilsTest fails because the data position is not reset before calling createFromParcel(). Change-Id: I6d5cc093ff65019ab0d2191bb0bd9c10ae49612b
| * | | am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation ↵Neil Fuller2014-10-201-0/+116
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with calls to Math" * commit 'dfcf065505a12aa358af5cd2607fd355eee964c4': Replacing FloatMath native implementation with calls to Math
| * \ \ \ am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native ↵Elliott Hughes2014-10-181-103/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation with calls to Math"" * commit '84e6d466edc2aba711f90431a1cd209d11c0e70d': Revert "Replacing FloatMath native implementation with calls to Math"
| * \ \ \ \ am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation ↵Neil Fuller2014-10-161-0/+103
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with calls to Math" * commit '8a3785cafec4b47fe8d61614b04a0e193d616428': Replacing FloatMath native implementation with calls to Math
* | \ \ \ \ \ am 6e2e4b73: Merge "Resurrect dusty PackageManagerTests." into lmp-mr1-dev ↵Jeff Sharkey2014-11-081-44/+53
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 9a2db6b * commit '6e2e4b7343eeae8ac8439bcf6bf3678609b4a230': Resurrect dusty PackageManagerTests.
| * | | | | | Merge "Resurrect dusty PackageManagerTests." into lmp-mr1-devJeff Sharkey2014-11-081-44/+53
| |\ \ \ \ \ \
| | * | | | | | Resurrect dusty PackageManagerTests.Jeff Sharkey2014-11-071-44/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly just getting them running again, still a few failures related to native library symlinks that need more investigation. Bug: 18048725 Change-Id: I4642adab9fb2b9ec1488b700edcee48c09e36005
* | | | | | | | am 42be51bd: Merge "Minimize the number of default enabled IMEs part 4" into ↵Yohei Yukawa2014-11-071-70/+111
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 50ef3d9 * commit '42be51bd98660b608596e6a8db63735ae552c996': Minimize the number of default enabled IMEs part 4
| * | | | | | | Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-devYohei Yukawa2014-11-061-70/+111
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Minimize the number of default enabled IMEs part 4Yohei Yukawa2014-11-061-70/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up CL for recent attempt to minimize the number of default enabled IMEs. - part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3 - part2: Ife93d909fb8a24471c425c903e2b7048826e17a3 - part3: I6571d464a46453934f0a8f5e79018a67a9a3c845 It turned out that the changes made in part2 and part3 are a bit overkill, and users will see no software keyboards in some particular situations. The problem we missed in the previous CLs is the fact that InputMethodInfo#isDefault is indeed a locale-dependent value, hence it may vary depending on the system locale. Existing unittests also failed to abstract such locale-dependent nature. In order to addresses that regression, the selection logic is a bit widely reorganized in this CL. Now the logic is implemented as a series of fallback rules. Also, unit tests are updated to be able to 1) test the order of the enabled IMEs, and 2) emulate the locale-dependent behavior of InputMethodInfo#isDefault to enrich test cases. BUG: 17347871 BUG: 18192576 Change-Id: I871ccda787eb0f1099ba3574356c1da4b33681f3
* | | | | | | | am dd40ccf3: am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to ↵Jeff Davidson2014-11-051-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev * commit 'dd40ccf36203c740aea3849f54495d1287d02b2b': Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
| * | | | | | | Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.Jeff Davidson2014-11-041-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary/desired for two reasons: 1. UX around network scoring shipped with L despite lacking underlying platform support. We do not want network scoring applications to trigger this UX on L devices, and therefore we must break the contract of what defines a network scorer so that apps build against the new contract don't trigger the old UX. 2. As a start towards generalizing the term "score" for a potentially broader role in the future, though that role is very much undefined. Bug: 18160480 Change-Id: If228977513e32e45bc44dbeda24aa18436fdfca6
* | | | | | | am befe778c: Treat optimistic addresses as global preferred.Erik Kline2014-10-301-0/+72
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 9a8351d * commit '9a8351d9d7d1e002187fca20fea48d1e9214d829': Treat optimistic addresses as global preferred.
| * | | | | | Treat optimistic addresses as global preferred.Erik Kline2014-10-291-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the kernel sends notification of an optimistic address then treat is a useable address (isGlobalPreferred()). Note that addresses flagged as IFA_F_OPTIMISTIC are simultaneously flagged as IFA_F_TENTATIVE (when the tentative state has cleared either DAD has succeeded or failed, and both flags are cleared regardless). Additionally: do not consider RFC 4193 ULA addresses sufficient for "global preffered". They are, by definition, of global scope but not sufficient for global reachability. Bug: 17769720 Change-Id: I759623b28fd52758f2d4d76d167f3cafd9319d6a
* | | | | | | Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev ↵Erik Kline2014-10-281-0/+45
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: dd91fb4 automerge: 8fc600d * commit '8fc600d1a8fc4f9cedceee185d129a19b06001c5': (re)define the definition of "provisioned"
| * | | | | | Merge "(re)define the definition of "provisioned"" into lmp-mr1-devErik Kline2014-10-281-0/+45
| |\ \ \ \ \ \
| | * | | | | | (re)define the definition of "provisioned"Erik Kline2014-10-281-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically: [1] provide a hasIPv4(), and [2] a hasIPv6() each of which requires an IP address, a default route, and address-family-specific DNS servers to evaluate to true. Additionally: [3] redefine isProvisioned() to return the logical OR of [1] and [2] above. Any external caller can still use any of the has*() methods to construct its own, different definition of "provisioned". Bug: 17769720 Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807
* | | | | | | | am 111cc9f5: Merge "Change removeStackedLink to take an interface name." ↵Lorenzo Colitti2014-10-281-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 35261c4 * commit '35261c4351ea42b2bbd057e852f50158de8eda9c': Change removeStackedLink to take an interface name.
| * | | | | | | Change removeStackedLink to take an interface name.Lorenzo Colitti2014-10-281-3/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies callers. Also remove all "implementations" of addStackedLink and removeStackedLink except the one in LinkProperties, because they are unused. Bug: 12111730 Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
* | | | | | | am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme ↵Yigit Boyar2014-10-2310-0/+419
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | based cache" into lmp-mr1-dev * commit 'f3ab441090a05bd428b9488b2e8e175f33bd6fe9': Added a generic configuration and theme based cache
| * | | | | | Merge "Added a generic configuration and theme based cache" into lmp-mr1-devYigit Boyar2014-10-2310-0/+419
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Added a generic configuration and theme based cacheYigit Boyar2014-10-2310-0/+419
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, only animators use it but we can consider migrating drawable cache to it as well. Bug: 17456416 Change-Id: I571b96856805edb171f0fc52e6bff5a365f46b70
* | | | | | am 868878bd: am 46ca296c: am d2983ced: am 34766d9c: Merge "Add delay in ping ↵Eric Rowe2014-10-234-33/+18
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connectivity test retry" into lmp-dev * commit '868878bd91583590badd9aae882247358bfd695f': Add delay in ping connectivity test retry
| * | | | | Add delay in ping connectivity test retryEric Rowe2014-10-224-33/+18
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Id6e36f42b2a2d84605185780fb7a3f2144e7a9b9
* | | | | am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation ↵Neil Fuller2014-10-201-0/+116
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | with calls to Math" * commit 'dfcf065505a12aa358af5cd2607fd355eee964c4': Replacing FloatMath native implementation with calls to Math
| * | | | Replacing FloatMath native implementation with calls to MathNick Kralevich2014-10-201-0/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On modern versions of Android running in AOT mode FloatMath is slower than Math. Calls to Math.sqrt(), etc. are replaced by intrinsics which can be as small as a single CPU opcode. When running in interpreted mode the new implementation is unfortunately slower, but I'm judging this acceptable and likely to be improved over time. This change saves a small amount of native code. Example timings: Mako AOSP AOT: Method: Original / New / Direct call to Math ceil: 596ns / 146.ns / 111ns sqrt: 694ns / 56ns / 25ns Mako AOSP interpreted: Method: Original / New / Direct call to Math ceil: 1900ns / 2307ns / 1485ns sqrt: 1998ns / 2603ns / 1788ns Other calls Mako AOT: Method: Original / New cos: 635ns / 270ns exp: 566ns / 324ns floor: 604ns / 150ns hypot: 631ns / 232ns pow: 936ns / 643ns sin: 641ns / 299ns The advice to use Math directly, in preference to FloatMath, is still good. FloatMath will be deprecated separately. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: If07fcbd78543d13bc6d75f9743f999860e8d58d7
* | | | | am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native ↵Elliott Hughes2014-10-181-103/+0
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | implementation with calls to Math"" * commit '84e6d466edc2aba711f90431a1cd209d11c0e70d': Revert "Replacing FloatMath native implementation with calls to Math"
| * | | | Revert "Replacing FloatMath native implementation with calls to Math"Elliott Hughes2014-10-181-103/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | This reverts commit 32b88b48daa7383880088246d7222dd93cf55285. Change-Id: I40ea17f3a68f2b53eb013aebd3ba1becdc724f94
* | | | am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation ↵Neil Fuller2014-10-161-0/+103
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | with calls to Math" * commit '8a3785cafec4b47fe8d61614b04a0e193d616428': Replacing FloatMath native implementation with calls to Math
| * | Replacing FloatMath native implementation with calls to MathNeil Fuller2014-10-151-0/+103
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On modern versions of Android running in AOT mode FloatMath is slower than Math. Calls to Math.sqrt(), etc. are replaced by intrinsics which can be as small as a single CPU opcode. When running in interpreted mode the new implementation is unfortunately slower, but I'm judging this acceptable and likely to be improved over time. This change saves a small amount of native code. Example timings: Mako AOSP AOT: Method: Original / New / Direct call to Math ceil: 596ns / 146.ns / 111ns sqrt: 694ns / 56ns / 25ns Mako AOSP interpreted: Method: Original / New / Direct call to Math ceil: 1900ns / 2307ns / 1485ns sqrt: 1998ns / 2603ns / 1788ns Other calls Mako AOT: Method: Original / New cos: 635ns / 270ns exp: 566ns / 324ns floor: 604ns / 150ns hypot: 631ns / 232ns pow: 936ns / 643ns sin: 641ns / 299ns The advice to use Math directly, in preference to FloatMath, is still good. FloatMath will be deprecated separately. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I8d1947d88b3c576643138b1df589fb9da7c1ab88
| * Add support.multidex tests app for an update bug.Yohann Roussel2014-07-1621-0/+618
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The failing scenario is - install v1 - run - update to v2 - update to v3 - run last run was failing with initial multidex library versions because it's still running on v1 extracted secondary dex files. (cherry picked from commit 05e2a94c8b510131f43a686f5188d4c0f2a5eebd) Change-Id: Ibb5d16642b127ee4c0baddc4f6ba461c11d25f90
| * Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-291-13/+20
| |\
| | * am 1b007565: am 9b650702: Merge "Fix state transition verification." into ↵Xia Wang2014-03-181-13/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '1b007565c73097728496f3dbe811a51c879ba89e': Fix state transition verification.
* | | | Add CHANGE_NETWORK_STATE permission to bt testsEric Rowe2014-10-151-0/+1
| | | | | | | | | | | | | | | | Change-Id: Ie0a579de3b7d1163a8fe245eb377f21eeed048a3
* | | | Fix issue #17752399: Multiple apps broken by GET_TASKS permission changeDianne Hackborn2014-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep around GET_TASKS as a permission available to apps, so apps still think they have it and don't get all uppity because they don't. Add a new REAL_GET_TASKS that is the actual permission now. Plus some temporary compatibility code until everyone can transition fromn GET_TASKS to REAL_GET_TASKS. Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
* | | | NetworkStats always needs arrays.Jeff Sharkey2014-09-171-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internal logic relies on Arrays.copyOf(), so always give ourselves valid arrays, using shared empty objects to save overhead. Bug: 17502649 Change-Id: I5dbb00545bdfe45bbd48144ab505ea08cc92cbcd
* | | | Merge "Minimize the number of default enabled IMEs part 3" into lmp-devYohei Yukawa2014-09-161-11/+8
|\ \ \ \
| * | | | Minimize the number of default enabled IMEs part 3Yohei Yukawa2014-09-151-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this CL, the behavior of getDefaultEnabledImes() changes as follows: - Previously system IMEs are always enabled by default as long as it is a software keyboard that supports En_* subtype. With this CL, getDefaultEnabledImes() relies on the locale returned from getFallbackLocaleForDefaultIme() instead of calling isSystemImeThatHasEnglishKeyboardSubtype() to minimize the number of enabled IMEs. - Previously default enabled system IMEs are chosen in a country-agnostic way. As a result, "en_IN" is enabled even when the system locale is "en_US". With this CL, the system first tries to find IMEs with taking the coutnry into account, and use the country-agnostic way when and only when fallback logic is required. BUG: 17347871 Change-Id: I6571d464a46453934f0a8f5e79018a67a9a3c845
* | | | | Merge "temporarily enable wifi verbose logging in download manager test" ↵Guang Zhu2014-09-142-4/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into lmp-dev
| * | | | temporarily enable wifi verbose logging in download manager testGuang Zhu2014-09-142-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also temporarily compile against platfrom, not SDK, since we are using private API Bug: 17446070 Change-Id: I6da18aca2d5eaf305940514186ef2434e52f15b9
* | | | | Minimize the number of default enabled IMEs part 2Yohei Yukawa2014-09-141-19/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the system tried to enable at least one auxiliary IME even when the system is not ready. However, this doesn't make much sense because the user should be able to set up their phone without auxiliary IMEs. Also, IMEs enabled before the system becomes ready are kept to be enabled after the system becomes ready. Thus, we should minimize the number of enabled IMEs until the system becomes ready. BUG: 17347871 Change-Id: Ife93d909fb8a24471c425c903e2b7048826e17a3
* | | | Enrich test cases when enabling default IMEs part 4Yohei Yukawa2014-09-131-229/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is another groundwork for subsequent fixes. Notable changes in test cases are: - simplified test cases for voice IMEs. - added more test cases for keyboard IMEs. - introduced assertDefaultEnabledImes() to reduce code duplicate. BUG: 17347871 Change-Id: I8cf61cfa18ac425a2cccc7823474c3f06dc0fa1e
* | | | Merge "Fix wifi association tests" into lmp-devEric Rowe2014-09-112-94/+69
|\ \ \ \