summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-01-062-4/+4
* | | | | | | | | | | | | Merge "Add rotation-lock to Quick Settings on phones."John Spurlock2014-01-061-32/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add rotation-lock to Quick Settings on phones.John Spurlock2013-12-191-32/+41
* | | | | | | | | | | | | am 971003c9: am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-in...Raph Levien2014-01-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize erro...Raph Levien2014-01-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach"Raph Levien2014-01-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | am d7d07498: am a980c7aa: Merge "Re-initialize error after attach"Raph Levien2014-01-061-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge "Re-initialize error after attach"Raph Levien2014-01-061-1/+1
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Re-initialize error after attachDaniel 2 Olofsson2013-12-161-1/+1
| * | | | | | | | | | | | am 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO N...Todd Poynor2014-01-062-31/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGETodd Poynor2014-01-032-31/+0
| | |/ / / / / / / / / /
* | | | | | | | | | | | Merge "Allow Views to specify a theme override"Alan Viverette2014-01-041-9/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Allow Views to specify a theme overrideAlan Viverette2014-01-031-9/+32
* | | | | | | | | | | | Merge "NPE in BluetoothSocket.write()"Zhihai Xu2014-01-041-13/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | NPE in BluetoothSocket.write()Zhihai Xu2013-12-171-13/+14
* | | | | | | | | | | | | Merge "Camera2: fix onClosed callback issue"Zhijun He2014-01-031-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Camera2: fix onClosed callback issueZhijun He2014-01-021-3/+1
* | | | | | | | | | | | | | Merge "Camera2: remove waitUntilIdle from Camera2 API"Zhijun He2014-01-032-27/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | / / / / / / / / / / / | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Camera2: remove waitUntilIdle from Camera2 APIZhijun He2013-12-262-27/+1
* | | | | | | | | | | | | Merge "Create abstract base class for OpenGLRenderer"Chris Craik2013-12-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Create abstract base class for OpenGLRendererChris Craik2013-12-271-1/+1
* | | | | | | | | | | | | | Merge "Camera2: Update android.blackLevel.lock"Eino-Ville Talvala2013-12-302-20/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Camera2: Update android.blackLevel.lockEino-Ville Talvala2013-12-262-20/+20
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-12-301-1/+1
* | | | | | | | | | | | | | Merge "Avoid implicit parameter/return value casting of pointers."Chris Craik2013-12-281-118/+268
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Avoid implicit parameter/return value casting of pointers.Chris Craik2013-12-271-118/+268
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Avoid implicit parameter casting of pointers.Chris Craik2013-12-271-48/+99
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | am 6208ef25: am c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs:...quddusc2013-12-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplic...quddusc2013-12-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | / / | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| | * | | | | | | | | | am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateC...quddusc2013-12-261-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | * | | | | | | | | am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scro...quddusc2013-12-201-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter de...quddusc2013-12-201-1/+1
* | | | | | | | | | | | | Merge "Camera2: Update availableThumbnailSizes java doc"Zhijun He2013-12-263-6/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Camera2: Update availableThumbnailSizes java docZhijun He2013-12-263-6/+24
* | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-12-267-17/+17
* | | | | | | | | | | | | Add initial APIs for 3d view manipulation.Chris Craik2013-12-207-37/+143
* | | | | | | | | | | | | Merge "Move GLES20DisplayList functionality into DisplayList"Chris Craik2013-12-208-701/+522
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Move GLES20DisplayList functionality into DisplayListChris Craik2013-12-208-701/+522
* | | | | | | | | | | | | | Merge "Change wallpaper sizing"Michael Jurka2013-12-201-64/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Change wallpaper sizingMichael Jurka2013-12-191-64/+2
* | | | | | | | | | | | | | | Merge "BLE peripheral mode (3/4): Add peripheral mode API."Wei Wang2013-12-208-92/+394
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | BLE peripheral mode (3/4): Add peripheral mode API.Wei Wang2013-12-198-92/+394
* | | | | | | | | | | | | | | Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM"Glenn Kasten2013-12-201-9/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Prepare for additional formats beyond 8-bit and 16-bit PCMGlenn Kasten2013-12-191-9/+18
* | | | | | | | | | | | | | | | Merge "Add APIs and implementation for additional caption edge types"Alan Viverette2013-12-202-7/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add APIs and implementation for additional caption edge typesAlan Viverette2013-12-192-7/+40
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | am 9158825f: Move some system services to separate directoriesAmith Yamasani2013-12-191-13/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move some system services to separate directoriesAmith Yamasani2013-12-191-13/+27
* | | | | | | | | | | | | | | Merge "Improvements to battery stats."Dianne Hackborn2013-12-192-357/+534
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Improvements to battery stats.Dianne Hackborn2013-12-192-357/+534