diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-11-21 21:59:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 21:59:47 +0000 |
| commit | 4c9041cf837cda13c749b148661d18c3fab0fbd6 (patch) | |
| tree | 87333dd27d466a902aeb4da8321aab64c955dcf2 /libs/hwui/DisplayListOp.h | |
| parent | 6d274dc2a5afd6c8d9e1c44663781a14924d739d (diff) | |
| parent | 1ac13e0212a770c918d32e6c645682466113632c (diff) | |
| download | frameworks_base-4c9041cf837cda13c749b148661d18c3fab0fbd6.zip frameworks_base-4c9041cf837cda13c749b148661d18c3fab0fbd6.tar.gz frameworks_base-4c9041cf837cda13c749b148661d18c3fab0fbd6.tar.bz2 | |
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.
Diffstat (limited to 'libs/hwui/DisplayListOp.h')
0 files changed, 0 insertions, 0 deletions