summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fixing transition from tasks excluded from Recents into Recents."Winson Chung2014-04-222-7/+24
|\
| * Fixing transition from tasks excluded from Recents into Recents.Winson Chung2014-04-212-7/+24
* | Merge "Add touch feedback to edit text"Alan Viverette2014-04-224-39/+61
|\ \
| * | Add touch feedback to edit textAlan Viverette2014-04-214-39/+61
* | | Merge "Add overlay view in Tv Input Framework"Youngsang Cho2014-04-2210-29/+593
|\ \ \
| * | | Add overlay view in Tv Input FrameworkYoungsang Cho2014-04-1810-29/+593
* | | | Merge "Initial implementation of NetworkScoreManager's backing service."Jeff Davidson2014-04-2213-20/+365
|\ \ \ \
| * | | | Initial implementation of NetworkScoreManager's backing service.Jeff Davidson2014-04-2113-20/+365
* | | | | Merge "Make sure events handled on same looper"Robert Greenwalt2014-04-211-65/+99
|\ \ \ \ \
| * | | | | Make sure events handled on same looperRobert Greenwalt2014-04-211-65/+99
* | | | | | Merge "Overriding application icon with activity icon where available."Winson Chung2014-04-214-23/+16
|\ \ \ \ \ \
| * | | | | | Overriding application icon with activity icon where available.Winson Chung2014-04-214-23/+16
* | | | | | | am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when relea...Jeff Tinker2014-04-212-2/+10
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp...Jeff Tinker2014-04-212-2/+10
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "Allow DRM plugins to be destroyed when released" into klp-modular-devJeff Tinker2014-04-212-2/+10
| | |\ \ \ \ \ \ \
| | | * | | | | | | Allow DRM plugins to be destroyed when releasedJeff Tinker2014-04-112-2/+10
* | | | | | | | | | Merge "Try to always print time stamp in battery history."Dianne Hackborn2014-04-212-22/+62
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Try to always print time stamp in battery history.Dianne Hackborn2014-04-212-22/+62
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | am a281be67: am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into...Adam Lesinski2014-04-211-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-devAdam Lesinski2014-04-211-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Allow InputEvents to propagate w/o IME" into klp-modular-devAdam Lesinski2014-04-211-1/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Allow InputEvents to propagate w/o IMEAdam Lesinski2014-04-181-1/+2
* | | | | | | | | | am 43cea7ea: am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set a...Jesse Hall2014-04-211-2/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 contex...Jesse Hall2014-04-211-2/+6
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."Jesse Hall2014-04-211-2/+6
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."Jesse Hall2014-04-211-2/+6
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.Jin Zhebin2014-04-151-2/+6
* | | | | | | | | | | | | Merge "BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG"Colin Cross2014-04-211-5/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSGColin Cross2014-04-181-5/+24
* | | | | | | | | | | | | | Merge "Initial changes to add search bar."Winson Chung2014-04-2115-39/+242
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Initial changes to add search bar.Winson Chung2014-04-1715-39/+242
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | am 67881101: (-s ours) am fe755054: Merge "DO NOT MERGE Tear down PAN if w...Ariel Gertzenstein2014-04-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am fe755054: Merge "DO NOT MERGE Tear down PAN if we can\'t successfully c...Ariel Gertzenstein2014-04-211-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP...Ariel Gertzenstein2014-04-211-0/+8
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP requestAriel Gertzenstein2014-04-211-0/+8
* | | | | | | | | | | | | Merge "Avoid NPE when mRoot is null."Dan Sandler2014-04-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Avoid NPE when mRoot is null.Dan Sandler2014-04-211-1/+1
* | | | | | | | | | | | | am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
* | | | | | | | | | | | | | am 717884ea: (-s ours) am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_...Ying Wang2014-04-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | / / / / / / / / / | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JN...Ying Wang2014-04-212-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-212-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-192-2/+2
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-182-2/+2
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | Merge "Quick settings bug fixes."John Spurlock2014-04-213-19/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Quick settings bug fixes.John Spurlock2014-04-213-19/+32
* | | | | | | | | | | | | | Remove obsolete settings panel artifacts.John Spurlock2014-04-2114-444/+61
|/ / / / / / / / / / / / /