summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Merge "Unlinked providers STILL shouldn't cause crashes"Christopher Tate2014-03-271-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Unlinked providers STILL shouldn't cause crashesChristopher Tate2014-03-271-1/+2
* | | | | | | | | | | | | | | | | am 9410f598: am 723f7bbc: am 7f7ce0f7: am a2824410: Merge "Do not show Home b...Craig Mautner2014-03-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 723f7bbc: am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full sc...Craig Mautner2014-03-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity"Craig Mautner2014-03-271-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | am a2824410: Merge "Do not show Home behind full screen activity"Craig Mautner2014-03-271-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "Do not show Home behind full screen activity"Craig Mautner2014-03-271-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | Do not show Home behind full screen activityYevgen Pronenko2014-03-271-0/+1
* | | | | | | | | | | | | | | | | am 5454ac6b: Merge "Expand install observer semantics"Christopher Tate2014-03-2712-47/+485
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge "Expand install observer semantics"Christopher Tate2014-03-2712-47/+485
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Expand install observer semanticsChristopher Tate2014-03-2712-47/+485
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am 4a857b1d: Merge "Update framework to use M34 version of Skia."Leon Scroggins2014-03-278-161/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge "Update framework to use M34 version of Skia."Leon Scroggins2014-03-278-161/+70
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Update framework to use M34 version of Skia.Leon Scroggins2014-03-278-161/+70
* | | | | | | | | | | | | | | | | am 9ad8a533: am 9a5c6e68: am 4243710b: am 89f4a546: am 0c933df6: fix bug in c...Scott Main2014-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 9a5c6e68: am 4243710b: am 89f4a546: am 0c933df6: fix bug in code snippetScott Main2014-03-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 4243710b: am 89f4a546: am 0c933df6: fix bug in code snippetScott Main2014-03-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | am 89f4a546: am 0c933df6: fix bug in code snippetScott Main2014-03-271-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | am 0c933df6: fix bug in code snippetScott Main2014-03-271-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | | fix bug in code snippetScott Main2014-03-271-1/+1
* | | | | | | | | | | | | | | | | am f7fd0088: Merge "Uses VMRuntime.newUnpaddedArray for ideal array sizes"Adam Lesinski2014-03-2729-504/+415
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge "Uses VMRuntime.newUnpaddedArray for ideal array sizes"Adam Lesinski2014-03-2729-504/+415
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Uses VMRuntime.newUnpaddedArray for ideal array sizesAdam Lesinski2014-03-2729-504/+415
* | | | | | | | | | | | | | | | | | am 1c14c327: am c1a7d075: am 232d4224: am f0ffa8a3: Merge "app_process: use L...Colin Cross2014-03-271-22/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am c1a7d075: am 232d4224: am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB...Colin Cross2014-03-271-22/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 232d4224: am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"Colin Cross2014-03-271-22/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"Colin Cross2014-03-271-22/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "app_process: use LOCAL_MULTILIB := both"Colin Cross2014-03-271-22/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | app_process: use LOCAL_MULTILIB := bothColin Cross2014-03-271-22/+3
* | | | | | | | | | | | | | | | | | am 350159c6: resolved conflicts for merge of 6984e4f9 to masterAdam Lesinski2014-03-271-30/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | resolved conflicts for merge of 6984e4f9 to masterAdam Lesinski2014-03-271-30/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am fc680b89: Merge "Fix a race in NotificationManager with Listeners" into kl...Adam Lesinski2014-03-271-22/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Fix a race in NotificationManager with Listeners" into klp-modular-devAdam Lesinski2014-03-271-22/+27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Fix a race in NotificationManager with ListenersAdam Lesinski2014-03-261-22/+27
* | | | | | | | | | | | | | | | | | | am d00e8b5f: Merge "Improved integration of NotificationStackScroller"Selim Cinek2014-03-271-42/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge "Improved integration of NotificationStackScroller"Selim Cinek2014-03-271-42/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Improved integration of NotificationStackScrollerSelim Cinek2014-03-271-42/+56
* | | | | | | | | | | | | | | | | | | am 07b6c552: Merge "Async drawing!"John Reck2014-03-2712-57/+294
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge "Async drawing!"John Reck2014-03-2712-57/+294
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Async drawing!John Reck2014-03-2712-57/+294
* | | | | | | | | | | | | | | | | | | am ca04d718: Merge "Add a mediastore constant for playlists."Matt Casey2014-03-272-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge "Add a mediastore constant for playlists."Matt Casey2014-03-272-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Add a mediastore constant for playlists.Matt Casey2014-03-262-0/+5
* | | | | | | | | | | | | | | | | | | | am 64754273: Fix build.Jorim Jaggi2014-03-274-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Fix build.Jorim Jaggi2014-03-274-6/+6
* | | | | | | | | | | | | | | | | | | | am f1efa3ee: Merge "resolved conflicts for merge of 22d07464 to master"Narayan Kamath2014-03-2718-84/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 22d07464 to master"Narayan Kamath2014-03-2718-84/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 22d07464 to masterNarayan Kamath2014-03-2718-84/+94
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aospNarayan Kamath2014-03-2721-96/+106
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | am cd3f60f3: Merge "AArch64: Make frameworks/base code more portable"Narayan Kamath2014-03-2721-95/+105
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | |