commit | 2e9a426529c54774b23609bee8d50118118ab895 | [log] [tgz] |
---|---|---|
author | Yuhao Zheng <yuhaozheng@google.com> | Thu Sep 19 14:14:14 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 19 14:14:14 2013 -0700 |
tree | d93cfc411c35327d5f65f79e6c71846ac9fceb93 | |
parent | 9ea8bf154cdad4b4cb627d9d6c9a9bc01c31abcd [diff] | |
parent | 2ce3362385589df472aa8e221d01ca7d8118508d [diff] |
am 2ce33623: Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev * commit '2ce3362385589df472aa8e221d01ca7d8118508d': Remove STOPSHIP in WifiWatchdogStateMachine