summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add new sensor types.Jaikumar Ganesh2013-04-118-224/+555
* Merge "Make BluetoothGattServer.close() public" into jb-mr2-devMatthew Xie2013-04-112-2/+3
|\
| * Make BluetoothGattServer.close() publicAndre Eisenbach2013-04-102-2/+3
* | Merge "Clean up USAGE_SHARED and add syncing for USAGE_SHARED." into jb-mr2-devTim Murray2013-04-111-4/+13
|\ \
| * | Clean up USAGE_SHARED and add syncing for USAGE_SHARED.Tim Murray2013-04-091-4/+13
* | | am bc80d99b: am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tag...Scott Main2013-04-1025-28/+35
|\ \ \
| * \ \ am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest...Scott Main2013-04-1025-28/+35
| |\ \ \
| | * \ \ am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the train...Scott Main2013-04-1025-28/+35
| | |\ \ \
| | | * \ \ am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classesScott Main2013-04-1025-28/+35
| | | |\ \ \
| | | | * \ \ am 1c2dea05: add meta tags to the rest of the training classesScott Main2013-04-1025-28/+35
| | | | |\ \ \
| | | | | * | | add meta tags to the rest of the training classesScott Main2013-04-1025-28/+35
* | | | | | | | Merge "Don't sync from adapters that haven't opted in to restricted accounts"...Amith Yamasani2013-04-112-4/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't sync from adapters that haven't opted in to restricted accountsAmith Yamasani2013-04-102-4/+36
* | | | | | | | | Fix a security check in getting app restrictionsAmith Yamasani2013-04-101-2/+5
* | | | | | | | | Merge "Show an error dialog when account type is requested on a limited user"...Amith Yamasani2013-04-113-0/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Show an error dialog when account type is requested on a limited userAmith Yamasani2013-04-103-0/+57
| |/ / / / / / / /
* | | | | | | | | Merge "Fix missing clock in keyguard" into jb-mr2-devJim Miller2013-04-112-3/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix missing clock in keyguardJim Miller2013-04-102-3/+10
* | | | | | | | | Merge "Implicitly enable system apps when updates installed" into jb-mr2-devChristopher Tate2013-04-101-0/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Implicitly enable system apps when updates installedChristopher Tate2013-04-091-0/+18
* | | | | | | | | | Merge "Debug logging improvement." into jb-mr2-devCraig Mautner2013-04-101-8/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Debug logging improvement.Craig Mautner2013-04-101-8/+8
* | | | | | | | | | | Merge "Fix for bug 8574856 - bad metrics in Roboto Italic" into jb-mr2-devRaph Levien2013-04-101-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix for bug 8574856 - bad metrics in Roboto ItalicRaph Levien2013-04-101-0/+0
* | | | | | | | | | | | Merge "Make MediaRouter ignore remembered wifi displays when wifi display is ...Adam Powell2013-04-101-4/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make MediaRouter ignore remembered wifi displays when wifi display is offAdam Powell2013-04-101-4/+13
* | | | | | | | | | | | | Merge "Send joystick key repeat messages to correct handler" into jb-mr2-devMichael Wright2013-04-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Send joystick key repeat messages to correct handlerMichael Wright2013-04-101-1/+1
* | | | | | | | | | | | | | Merge "Obfuscate any phone numbers that pass through the event log." into jb-...Santos Cordon2013-04-101-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Obfuscate any phone numbers that pass through the event log.Santos Cordon2013-03-061-2/+5
* | | | | | | | | | | | | | | GPS Hardware geofencing.Jaikumar Ganesh2013-04-1016-8/+1973
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Permit null adapters in Spinners" into jb-mr2-devAdam Powell2013-04-101-13/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Permit null adapters in SpinnersAdam Powell2013-04-101-13/+16
* | | | | | | | | | | | | | Merge "Don't draw synchronously in onResume()" into jb-mr2-devMathias Agopian2013-04-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Don't draw synchronously in onResume()Mathias Agopian2013-04-101-1/+1
* | | | | | | | | | | | | | | am 0b6162e1: am 3f156d73: am 12ee56aa: am 5f27b486: am 53bbb4ff: Merge "docs:...Joe Fernandez2013-04-101-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 3f156d73: am 12ee56aa: am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev G...Joe Fernandez2013-04-101-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | am 12ee56aa: am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug...Joe Fernandez2013-04-101-4/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" in...Joe Fernandez2013-04-101-4/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docsJoe Fernandez2013-04-101-4/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docsJoe Fernandez2013-04-101-4/+5
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | docs: OpenGL Dev Guide, fix bug: 6104328Joe Fernandez2013-04-031-4/+5
* | | | | | | | | | | | | | | | Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery ...Dianne Hackborn2013-04-102-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery statsDianne Hackborn2013-04-102-6/+0
* | | | | | | | | | | | | | | | | Merge "Stop marking gamepads as keyboards" into jb-mr2-devMichael Wright2013-04-101-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Stop marking gamepads as keyboardsMichael Wright2013-04-081-5/+8
* | | | | | | | | | | | | | | | | | Merge "Instrument views inflation in systrace" into jb-mr2-devRomain Guy2013-04-101-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Instrument views inflation in systraceRomain Guy2013-04-101-0/+9
* | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-04-1049-99/+195
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-04-1049-99/+195
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |