summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am a53e955a: Merge "libgui: Plumb attach/detach through Surface" into stage-a...Dan Stoza2015-04-072-1/+54
|\
| * Merge "libgui: Plumb attach/detach through Surface" into stage-aosp-masterDan Stoza2015-04-072-1/+54
| |\
| | * libgui: Plumb attach/detach through SurfaceDan Stoza2015-04-072-1/+54
* | | am e55cae86: Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-masterDan Stoza2015-04-0715-346/+12
|\ \ \ | |/ /
| * | Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-masterDan Stoza2015-04-0715-346/+12
| |\ \ | | |/
| | * libgui: Remove IGBC::BufferItemDan Stoza2015-04-0715-346/+12
* | | am 9e99fce8: am 1cd030be: Merge "Switch installd to compile as C++."Jeff Sharkey2015-04-076-41/+43
|\ \ \ | |/ /
| * | am 1cd030be: Merge "Switch installd to compile as C++."Jeff Sharkey2015-04-076-41/+43
| |\ \
| | * \ Merge "Switch installd to compile as C++."Jeff Sharkey2015-04-076-41/+43
| | |\ \
| | | * | Switch installd to compile as C++.Jeff Sharkey2015-04-076-41/+43
* | | | | am dc10342d: am 2d42dc74: Merge "Valid APK paths now include expanded storage."Jeff Sharkey2015-04-074-5/+16
|\ \ \ \ \ | |/ / / /
| * | | | am 2d42dc74: Merge "Valid APK paths now include expanded storage."Jeff Sharkey2015-04-074-5/+16
| |\ \ \ \ | | |/ / /
| | * | | Merge "Valid APK paths now include expanded storage."Jeff Sharkey2015-04-074-5/+16
| | |\ \ \ | | | |/ /
| | | * | Valid APK paths now include expanded storage.Jeff Sharkey2015-04-074-5/+16
| | |/ /
* | | | am 4914f85f: am 8f43f77d: Merge "Use AID_SYSTEM as uid when creating oat dir"Fyodor Kupolov2015-04-071-12/+2
|\ \ \ \ | |/ / /
| * | | am 8f43f77d: Merge "Use AID_SYSTEM as uid when creating oat dir"Fyodor Kupolov2015-04-071-12/+2
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge "Use AID_SYSTEM as uid when creating oat dir"Fyodor Kupolov2015-04-071-12/+2
| | |\
| | | * Use AID_SYSTEM as uid when creating oat dirFyodor Kupolov2015-04-071-12/+2
| | |/
* | | Merge "Cherry-pick dataSpace and BufferItem changes" into lmp-mr1-dev-plus-aospDan Stoza2015-04-0737-91/+388
|\ \ \
| * | | Cherry-pick dataSpace and BufferItem changesEino-Ville Talvala2015-04-0737-91/+388
* | | | am 46072d58: am a60ff367: Merge "Remove useless \'svcmgr_handle\' (which had ...Elliott Hughes2015-04-061-6/+4
|\ \ \ \ | | |/ / | |/| |
| * | | am a60ff367: Merge "Remove useless \'svcmgr_handle\' (which had wrong type)."Elliott Hughes2015-04-061-6/+4
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Remove useless 'svcmgr_handle' (which had wrong type)."Elliott Hughes2015-04-061-6/+4
| | |\ \
| | | * | Remove useless 'svcmgr_handle' (which had wrong type).Elliott Hughes2015-04-031-6/+4
* | | | | am 6c450101: (-s ours) DO NOT MERGE Cherry-pick dataSpace and BufferItem changesEino-Ville Talvala2015-04-060-0/+0
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | DO NOT MERGE Cherry-pick dataSpace and BufferItem changesEino-Ville Talvala2015-04-0637-91/+388
* | | | am 8d9f899a: am 031fec0b: Merge "ServiceManager: Print kernel/userspace binde...Elliott Hughes2015-04-041-1/+3
|\ \ \ \ | |/ / /
| * | | am 031fec0b: Merge "ServiceManager: Print kernel/userspace binder version"Elliott Hughes2015-04-041-1/+3
| |\ \ \ | | |/ /
| | * | Merge "ServiceManager: Print kernel/userspace binder version"Elliott Hughes2015-04-041-1/+3
| | |\ \ | | | |/ | | |/|
| | | * ServiceManager: Print kernel/userspace binder versionSerban Constantinescu2015-04-031-1/+3
| | |/
* | | am 03af2bf6: (-s ours) am 1e954441: (-s ours) Merge "DO NOT MERGE libgui: Plu...Dan Stoza2015-04-030-0/+0
|\ \ \ | |/ /
| * | am 1e954441: (-s ours) Merge "DO NOT MERGE libgui: Plumb attach/detach throug...Dan Stoza2015-04-030-0/+0
| |\ \ | | |/
| | * Merge "DO NOT MERGE libgui: Plumb attach/detach through Surface"Dan Stoza2015-04-032-1/+54
| | |\
| | | * DO NOT MERGE libgui: Plumb attach/detach through SurfaceDan Stoza2015-04-022-1/+54
* | | | am ebca76c2: am 9cad1985: Merge "Fix errors caused by unused variables"Fyodor Kupolov2015-04-031-2/+1
|\ \ \ \ | |/ / /
| * | | am 9cad1985: Merge "Fix errors caused by unused variables"Fyodor Kupolov2015-04-031-2/+1
| |\ \ \ | | |/ /
| | * | Merge "Fix errors caused by unused variables"Fyodor Kupolov2015-04-031-2/+1
| | |\ \
| | | * | Fix errors caused by unused variablesFyodor Kupolov2015-04-021-2/+1
| | |/ /
* | | | am 63750cb6: am 4eb88f88: Merge "Support for storing OAT files in app directory"Fyodor Kupolov2015-04-023-27/+116
|\ \ \ \ | |/ / /
| * | | am 4eb88f88: Merge "Support for storing OAT files in app directory"Fyodor Kupolov2015-04-023-27/+116
| |\ \ \ | | |/ /
| | * | Merge "Support for storing OAT files in app directory"Fyodor Kupolov2015-04-023-27/+116
| | |\ \ | | | |/ | | |/|
| | | * Support for storing OAT files in app directoryFyodor Kupolov2015-03-303-27/+116
* | | | am 2cc42f0b: (-s ours) Installd: Support dex2oat threads system propertyAndreas Gampe2015-04-020-0/+0
|\ \ \ \
| * | | | Installd: Support dex2oat threads system propertyAndreas Gampe2015-03-301-0/+12
* | | | | am 0f9bf17a: am 23b204e1: Merge "servicemanager: service_manager missing incl...Mark Salyzyn2015-04-011-2/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 23b204e1: Merge "servicemanager: service_manager missing include for strin...Mark Salyzyn2015-04-011-2/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "servicemanager: service_manager missing include for string.h"Mark Salyzyn2015-04-011-2/+3
| | |\ \ \
| | | * | | servicemanager: service_manager missing include for string.hMark Salyzyn2015-04-011-2/+3
* | | | | | am 940414b6: (-s ours) am ef62116d: (-s ours) Merge "DO NOT MERGE libgui: Rem...Dan Stoza2015-04-010-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ef62116d: (-s ours) Merge "DO NOT MERGE libgui: Remove IGBC::BufferItem"Dan Stoza2015-04-010-0/+0
| |\ \ \ \ \ | | |/ / / /