| commit | 1ac13e0212a770c918d32e6c645682466113632c | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Nov 21 21:53:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 21:53:10 2014 +0000 |
| tree | b61c13d7632ca2dae5519fb4d748a45c9148319a | |
| parent | c86f09d714360ddcc0363157b56ae7446770ae01 [diff] | |
| parent | 682ed6b60807d5fa971dbd6c76deae788cb65df4 [diff] |
am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev * commit '682ed6b60807d5fa971dbd6c76deae788cb65df4': Support keeping activities resumed while dozing.