commit | 39fa40cbadba3491b537ff2b5660d6507098da19 | [log] [tgz] |
---|---|---|
author | Adam Lesinski <adamlesinski@google.com> | Fri Mar 20 18:07:23 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 20 18:07:24 2015 +0000 |
tree | 039f4842df2adf08d6748fbe2b7d39dbb9ef28e3 | |
parent | a92c07809c0803ad1b1c907bf332e50826cad3b5 [diff] | |
parent | cb204c3334efcf0d49e0c9ba307afa7225157004 [diff] |
Merge "Disable WiFi energy data collection to avoid deadlock"