summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvas...Jesse Hall2014-10-131-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails...Jesse Hall2014-10-131-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Surface: Leave object in unlocked state when unlockCanvasAndPost failsJesse Hall2014-10-131-4/+7
* | | | | | | | | | | | | | | am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from ...Amit Mahajan2014-10-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | / / / / / | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to ...Amit Mahajan2014-10-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous toAmit Mahajan2014-10-131-1/+1
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | am 2dfd8d57: Merge "Update config when "Show input method" is changed" into l...Yohei Yukawa2014-10-131-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Update config when "Show input method" is changed" into lmp-devYohei Yukawa2014-10-131-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Update config when "Show input method" is changedYohei Yukawa2014-10-101-2/+5
* | | | | | | | | | | | | | am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or s...Mike Lockwood2014-10-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into l...Mike Lockwood2014-10-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Change RECEIVE_BLUETOOTH_MAP permission to signature or systemMike Lockwood2014-10-131-1/+1
* | | | | | | | | | | | | | am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-devMichael Wright2014-10-131-12/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Clean-up ColorFade's shaders and buffers." into lmp-devMichael Wright2014-10-131-12/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Clean-up ColorFade's shaders and buffers.Michael Wright2014-10-091-12/+29
* | | | | | | | | | | | | | am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-134-85/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-134-85/+85
* | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-133-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-133-7/+7
* | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-137-69/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-137-69/+69
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | am d700e5a3: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-10-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| / / / / / / / / / / / / / | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-138-438/+438
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | am 43751757: Merge "Remove the default WebView text encoding resource entirel...Marcin Kosiba2014-10-133-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Remove the default WebView text encoding resource entirely." into lmp-devMarcin Kosiba2014-10-133-6/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Remove the default WebView text encoding resource entirely.Marcin Kosiba2014-10-103-6/+2
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | am 7e522af6: Merge "docs: Move the L-Developer Preview samples page to the De...Joe Fernandez2014-10-139-1/+243
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "docs: Move the L-Developer Preview samples page to the Developer Sampl...Joe Fernandez2014-10-139-1/+243
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | docs: Move the L-Developer Preview samples page to the Developer Samples areaJoe Fernandez2014-10-129-1/+243
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | am cd2445a9: docs: Migrate TV Design docs to main DAC-Design areaJoe Fernandez2014-10-1316-102/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | docs: Migrate TV Design docs to main DAC-Design areaJoe Fernandez2014-10-1216-102/+105
* | | | | | | | | | | | | am 15edcda5: docs: migrate Android TV games page to TV training sectionJoe Fernandez2014-10-133-186/+288
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | docs: migrate Android TV games page to TV training sectionJoe Fernandez2014-10-123-186/+288
* | | | | | | | | | | | | am e6b9abb3: docs: migrate Android TV content discoveryJoe Fernandez2014-10-135-143/+276
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | docs: migrate Android TV content discoveryJoe Fernandez2014-10-125-143/+276
* | | | | | | | | | | | | am f666355b: docs: migrate TV Playback app contentJoe Fernandez2014-10-134-98/+230
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | docs: migrate TV Playback app contentJoe Fernandez2014-10-124-98/+230
* | | | | | | | | | | | | am d86a2f5b: docs: Android TV App Dev Basic TrainingJoe Fernandez2014-10-1314-1540/+1165
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | docs: Android TV App Dev Basic TrainingJoe Fernandez2014-10-1214-1540/+1165
| |/ / / / / / / / / / /
* | | | | | | | | | | | Revert "Add color to PhoneAccount objects (1/3)"Ihab Awad2014-10-111-22/+0
* | | | | | | | | | | | am bbbeafa9: Merge "Fix issue #17829949: Don\'t kill Bluetooth service..." in...Dianne Hackborn2014-10-113-7/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Fix issue #17829949: Don't kill Bluetooth service..." into lmp-devDianne Hackborn2014-10-113-7/+19
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix issue #17829949: Don't kill Bluetooth service...Dianne Hackborn2014-10-103-7/+19
| | |/ / / / / / / / / /
* | | | | | | | | | | | am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0....Amit Mahajan2014-10-111-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-devAmit Mahajan2014-10-111-3/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix to show low LTE signal strength as -140 instead of 0.Amit Mahajan2014-10-101-3/+2
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" i...Alan Viverette2014-10-112-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-devAlan Viverette2014-10-102-4/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Add Cutive Mono as serif monospace font for captioningAlan Viverette2014-10-102-4/+19