summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 5525a43a: am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and...Roman Nurik2012-01-273-3/+37
|\
| * am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle dow...Roman Nurik2012-01-263-3/+37
| |\
| | * Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" ...Roman Nurik2012-01-263-3/+37
| | |\
| | | * docs: add NOTICE to action bar icon pack and sprinkle download linksRoman Nurik2012-01-263-3/+37
* | | | am 9d9c7189: am 00b3ceb4: Merge "docs: Update designing-navigation training c...Roman Nurik2012-01-275-9/+56
|\ \ \ \ | |/ / /
| * | | am 00b3ceb4: Merge "docs: Update designing-navigation training class to link ...Roman Nurik2012-01-265-9/+56
| |\ \ \ | | |/ /
| | * | Merge "docs: Update designing-navigation training class to link to Android De...Roman Nurik2012-01-265-9/+56
| | |\ \ | | | |/ | | |/|
| | | * docs: Update designing-navigation training class to link to Android DesignRoman Nurik2012-01-265-9/+56
* | | | Fix 5906830: Don't crash on lock screens that lack a clock.Jim Miller2012-01-271-2/+4
* | | | Merge "Fix 5906830: Update the clock earlier when lock screen comes back from...Jim Miller2012-01-272-1/+8
|\ \ \ \
| * | | | Fix 5906830: Update the clock earlier when lock screen comes back from suspend.Jim Miller2012-01-272-1/+8
* | | | | Merge "Improve watchdog monitor for InputReader and InputDispatcher."Jeff Brown2012-01-274-3/+16
|\ \ \ \ \
| * | | | | Improve watchdog monitor for InputReader and InputDispatcher.Jeff Brown2012-01-274-3/+16
* | | | | | Merge "Implement a cancelation mechanism for queries."Jeff Brown2012-01-2730-202/+1156
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Implement a cancelation mechanism for queries.Jeff Brown2012-01-2730-202/+1156
* | | | | | Use final on new member variablesGlenn Kasten2012-01-2713-30/+31
* | | | | | Merge "Bug 5567648 Request and abandon audio focus in calls"Jean-Michel Trivi2012-01-271-10/+29
|\ \ \ \ \ \
| * | | | | | Bug 5567648 Request and abandon audio focus in callsJean-Michel Trivi2012-01-271-10/+29
| | |/ / / / | |/| | | |
* | | | | | Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE"Fabrice Di Meglio2012-01-276-206/+174
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHEFabrice Di Meglio2012-01-276-206/+174
* | | | | | Merge "Bug 5567648 disassociate audio mode and audio focus"Jean-Michel Trivi2012-01-272-40/+40
|\ \ \ \ \ \
| * | | | | | Bug 5567648 disassociate audio mode and audio focusJean-Michel Trivi2012-01-272-40/+40
* | | | | | | Merge "Remove optional LVMX service"Glenn Kasten2012-01-272-6/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove optional LVMX serviceGlenn Kasten2012-01-272-6/+0
* | | | | | | | Merge "Fix for IOOB when suggestions have disappeared"Gilles Debunne2012-01-271-6/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix for IOOB when suggestions have disappearedGilles Debunne2012-01-251-6/+10
* | | | | | | | | Merge "Handle tap and move cursor before showing suggestions"Gilles Debunne2012-01-271-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Handle tap and move cursor before showing suggestionsGilles Debunne2012-01-251-3/+3
* | | | | | | | | | Merge "Revert "Hack to workaround the fact that the EGL context can be""Teng-Hui Zhu2012-01-271-16/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Hack to workaround the fact that the EGL context can be"Teng-Hui Zhu2012-01-251-16/+0
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-01-271-1/+1
* | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-01-2749-925/+1347
|/ / / / / / / / / / /
* | | | | | | | | | | Merge "Mark locale-neutral configuration strings translatable="false""Eric Fischer2012-01-271-15/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Mark locale-neutral configuration strings translatable="false"Eric Fischer2012-01-271-15/+15
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Fix doc bug."Nick Pelly2012-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix doc bug.Nick Pelly2012-01-271-1/+1
* | | | | | | | | | | | Merge "Fix build: update current.txt"Nick Pelly2012-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fix build: update current.txtNick Pelly2012-01-271-1/+1
* | | | | | | | | | | | Merge "Don't wait forever if there are no commands to execute."Stephen Hines2012-01-271-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't wait forever if there are no commands to execute.Stephen Hines2012-01-261-2/+7
* | | | | | | | | | | | | Merge "Add NdefMessage.getByteLength(), and more minor fixes:"Nick Pelly2012-01-277-50/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Add NdefMessage.getByteLength(), and more minor fixes:Nick Pelly2012-01-267-50/+42
* | | | | | | | | | | | | Merge "SurfaceTexture: use fence sync on omap4 & s5pc110"Jamie Gennis2012-01-271-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | SurfaceTexture: use fence sync on omap4 & s5pc110Daniel Lam2012-01-221-0/+7
* | | | | | | | | | | | | | Merge "Use audio_source_t consistently"Glenn Kasten2012-01-2712-24/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Use audio_source_t consistentlyGlenn Kasten2012-01-2612-24/+30
* | | | | | | | | | | | | | Merge "AudioStreamIn and AudioStreamOut"Glenn Kasten2012-01-272-9/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | AudioStreamIn and AudioStreamOutGlenn Kasten2012-01-262-9/+15
* | | | | | | | | | | | | | | Merge "Declare methods in binder opcode order"Glenn Kasten2012-01-272-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \