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