summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 6050eb54: am 5b11b3d6: am 31cee318: Merge "Specify public exponent for RSA"Chad Brubaker2015-03-231-0/+5
|\
| * am 5b11b3d6: am 31cee318: Merge "Specify public exponent for RSA"Chad Brubaker2015-03-211-0/+5
| |\
| | * am 31cee318: Merge "Specify public exponent for RSA"Chad Brubaker2015-03-211-0/+5
| | |\
| | | * Merge "Specify public exponent for RSA"Chad Brubaker2015-03-211-0/+5
| | | |\
| | | | * Specify public exponent for RSAChad Brubaker2015-03-201-0/+5
| | | |/
* | | | Merge "TIF: fix NPE in the case a hardware TV input is not ready to use."Dongwon Kang2015-03-231-1/+2
|\ \ \ \
| * | | | TIF: fix NPE in the case a hardware TV input is not ready to use.Dongwon Kang2015-03-231-1/+2
* | | | | Merge "Fix build"Alan Viverette2015-03-231-2/+2
|\ \ \ \ \
| * | | | | Fix buildAlan Viverette2015-03-231-2/+2
* | | | | | am 7163a0a1: (-s ours) am 57d7b5f4: (-s ours) am 1f9bad3c: (-s ours) Import t...Geoff Mendal2015-03-230-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 57d7b5f4: (-s ours) am 1f9bad3c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-210-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am 1f9bad3c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-210-0/+0
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-2074-302/+2276
* | | | | | | Merge "Adding null check for focused stack before trying to switch affiliated...Winson Chung2015-03-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Adding null check for focused stack before trying to switch affiliated tasks.Winson Chung2015-03-231-1/+1
* | | | | | | | Merge "Add null check and call destroy from single point."Craig Mautner2015-03-231-6/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Add null check and call destroy from single point.Craig Mautner2015-03-231-6/+10
* | | | | | | | Merge "Update date and time picker headers for dark theme"Alan Viverette2015-03-232-25/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Update date and time picker headers for dark themeAlan Viverette2015-03-232-25/+9
* | | | | | | | | Merge "Default ActivityInfo.resizeable to false for all SDK versions."Wale Ogunwale2015-03-231-2/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Default ActivityInfo.resizeable to false for all SDK versions.Wale Ogunwale2015-03-201-2/+1
* | | | | | | | | Docs nitAlan Viverette2015-03-231-1/+1
* | | | | | | | | Merge "Clean up date picker"Alan Viverette2015-03-232-77/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clean up date pickerAlan Viverette2015-03-232-77/+32
* | | | | | | | | | am d4f45766: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-230-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-20146-7791/+18556
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge "Changed recent multi-window UI to use persist.sys.debug.multi_window"Wale Ogunwale2015-03-232-4/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Changed recent multi-window UI to use persist.sys.debug.multi_windowWale Ogunwale2015-03-232-4/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge "Check for empty lookup keys in getLookupUri"Jay Shrauner2015-03-231-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Check for empty lookup keys in getLookupUriJay Shrauner2015-03-131-0/+6
* | | | | | | | | | Merge "resolved conflicts for merge of 13d81b6d to master"Jeff Brown2015-03-232-40/+84
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 13d81b6d to masterJeff Brown2015-03-232-40/+84
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | am 619ce1ce: am d6216305: Merge "Disable more hotkeys while in setup." into l...Jeff Brown2015-03-202-36/+75
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-devJeff Brown2015-03-202-36/+75
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge "Disable more hotkeys while in setup." into lmp-mr1-devJeff Brown2015-03-202-36/+75
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Disable more hotkeys while in setup.Jeff Brown2015-03-202-36/+75
* | | | | | | | | | | | Merge "DPM constants for specifying minimum version numbers for DO and DIA."Julia Reynolds2015-03-233-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | DPM constants for specifying minimum version numbers for DO and DIA.Julia Reynolds2015-03-203-0/+28
* | | | | | | | | | | | | Merge "Fix default width and height for PopupWindow's decor view"Alan Viverette2015-03-234-73/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix default width and height for PopupWindow's decor viewAlan Viverette2015-03-224-73/+89
* | | | | | | | | | | | | Merge "Correctly apply android:theme attribute from <include> tag"Alan Viverette2015-03-233-130/+188
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Correctly apply android:theme attribute from <include> tagAlan Viverette2015-03-203-130/+188
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Update DatePicker and CalendarView to latest Material spec"Alan Viverette2015-03-2332-1917/+1815
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update DatePicker and CalendarView to latest Material specAlan Viverette2015-03-2332-1917/+1815
* | | | | | | | | | | | | | Merge "Refactor theme colors, fix dialog background, accent in light Settings"Alan Viverette2015-03-232-23/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Refactor theme colors, fix dialog background, accent in light SettingsAlan Viverette2015-03-232-23/+31
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Set the appliance (tv/watch) in the configuration earlier"Adam Lesinski2015-03-232-9/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Set the appliance (tv/watch) in the configuration earlierAdam Lesinski2015-03-192-9/+23
* | | | | | | | | | | | | Merge "Fix radial time picker for Explore by Touch and scroll actions"Alan Viverette2015-03-231-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix radial time picker for Explore by Touch and scroll actionsAlan Viverette2015-03-231-12/+13
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |