| commit | fd7209773688124636835d63f474d1365ebbee17 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Nov 21 23:13:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 23:13:49 2014 +0000 |
| tree | c13e7cb26321d0731b88c64eeb22de3739b2afb1 | |
| parent | c099f7fbad5a249e800d30c2f3c389c4e5a0ddfe [diff] | |
| parent | 4c9041cf837cda13c749b148661d18c3fab0fbd6 [diff] |
am 4c9041cf: am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev * commit '4c9041cf837cda13c749b148661d18c3fab0fbd6': Support keeping activities resumed while dozing.