commit | f19f90b229c9d15b33895988fd5e4e13d786f616 | [log] [tgz] |
---|---|---|
author | Paul Jensen <pauljensen@google.com> | Wed Nov 26 18:43:29 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:43:29 2014 +0000 |
tree | 03631e77f913be6b92295ca34f927b5c8ca7d5b6 | |
parent | e4d336eb9542f59d9ab4d5bfb21ad4ce9fc5a83a [diff] | |
parent | 58a493accfeafa13fd77a16e832c5ad72a4c9006 [diff] |
am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev * commit '58a493accfeafa13fd77a16e832c5ad72a4c9006': Don't let NetworkMonitor state stop user-initiated transitions.