summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add missing accessor to CompoundDrawable, clean up javadoc"Alan Viverette2015-02-131-27/+35
|\
| * Add missing accessor to CompoundDrawable, clean up javadocAlan Viverette2015-02-121-27/+35
* | Merge "NLS: Add a public signal value for an undefined filter value."John Spurlock2015-02-131-3/+12
|\ \
| * | NLS: Add a public signal value for an undefined filter value.John Spurlock2015-02-131-3/+12
* | | Merge "Fix EditText RenderNode invalidation bugs"Raph Levien2015-02-131-0/+4
|\ \ \
| * | | Fix EditText RenderNode invalidation bugsRaph Levien2015-02-121-0/+4
* | | | Merge "RegisteredServicesCache now saves files to a user-specific dir"Fyodor Kupolov2015-02-132-130/+315
|\ \ \ \
| * | | | RegisteredServicesCache now saves files to a user-specific dirFyodor Kupolov2015-02-122-130/+315
* | | | | Merge "Allow sysui-managed remote volume controllers."John Spurlock2015-02-133-0/+56
|\ \ \ \ \
| * | | | | Allow sysui-managed remote volume controllers.John Spurlock2015-02-123-0/+56
| | |_|/ / | |/| | |
* | | | | Merge "Move apache specific portions of android.net.http to external/apache-h...Narayan Kamath2015-02-1348-7189/+1970
|\ \ \ \ \
| * | | | | Move apache specific portions of android.net.http to external/apache-http.Narayan Kamath2015-02-1248-7189/+1970
* | | | | | am 04057e5d: am 5136791b: am 599c1042: Accessibility: Ensure fresh accessilbi...Svetoslav2015-02-131-3/+29
|\ \ \ \ \ \
| * \ \ \ \ \ am 5136791b: am 599c1042: Accessibility: Ensure fresh accessilbity focused an...Svetoslav2015-02-131-3/+29
| |\ \ \ \ \ \
| | * \ \ \ \ \ am 599c1042: Accessibility: Ensure fresh accessilbity focused and input focus...Svetoslav2015-02-131-3/+29
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Accessibility: Ensure fresh accessilbity focused and input focused nodes.Svetoslav2015-02-131-3/+29
| | | |\ \ \ \ \ \
| | | | * | | | | | Accessibility: Ensure fresh accessilbity focused and input focused nodes.Svetoslav2015-02-131-3/+29
| | * | | | | | | | am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp...Ruben Brunk2015-02-131-5/+7
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
* | | | | | | | | | am f80fa0b5: am 6c477a29: am ec403e8f: Merge "Call startInput on return from ...Jeff Brown2015-02-131-13/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 6c477a29: am ec403e8f: Merge "Call startInput on return from sleep mode"Jeff Brown2015-02-131-13/+11
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge "Call startInput on return from sleep mode"Jeff Brown2015-02-131-13/+11
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Call startInput on return from sleep modeMikael Gullstrand2015-01-261-13/+11
* | | | | | | | | | | | am ff475c0e: Merge "camera2: Fix legacy scaling factor application." into lmp...Ruben Brunk2015-02-131-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev auto...Ruben Brunk2015-02-131-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-devRuben Brunk2015-02-131-5/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-devRuben Brunk2015-02-131-5/+7
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | camera2: Fix legacy scaling factor application.Ruben Brunk2015-02-121-5/+7
* | | | | | | | | | | | | Merge "MidiManager API tweaks:"Mike Lockwood2015-02-135-10/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | MidiManager API tweaks:Mike Lockwood2015-02-125-10/+12
* | | | | | | | | | | | | | Merge "Increase visibility of Transition.areValuesChanged() to protected to a...Todd Volkert2015-02-122-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Increase visibility of Transition.areValuesChanged() to protected to allowTodd Volkert2015-02-122-3/+13
* | | | | | | | | | | | | | | am 6f2dd8a9: Merge "Support circular magnification frame on circular devices"...Casey Burkhardt2015-02-122-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | / / / / / / / / / / / / | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 6f2dd8a9: Merge "Support circular magnification frame on circular devices"...Casey Burkhardt2015-02-122-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Support circular magnification frame on circular devices" into lmp-mr1...Casey Burkhardt2015-02-122-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Support circular magnification frame on circular devicesCasey Burkhardt2015-02-122-0/+4
| | * | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-1272-7/+79
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-1272-7/+79
* | | | | | | | | | | | | | | Merge "Revert "Increase visibility of Transition.areValuesChanged() to protec...Todd Volkert2015-02-122-13/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Revert "Increase visibility of Transition.areValuesChanged() to protected to ...Todd Volkert2015-02-122-13/+3
* | | | | | | | | | | | | | | | Merge "Increase visibility of Transition.areValuesChanged() to protected to a...Todd Volkert2015-02-122-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Increase visibility of Transition.areValuesChanged() to protected to allowTodd Volkert2015-02-122-3/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Update the @ServiceName annotation"Tor Norbye2015-02-121-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Update the @ServiceName annotationTor Norbye2015-02-121-2/+13
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Interval tree for SpannableStringBuilder"Raph Levien2015-02-121-189/+361
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Interval tree for SpannableStringBuilderRaph Levien2015-02-121-189/+361
* | | | | | | | | | | | | | | Merge "Intern strings used in Sensor information."destradaa2015-02-122-9/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Intern strings used in Sensor information.destradaa2015-02-102-9/+145
* | | | | | | | | | | | | | | | am f69f3737: am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for...Jeremy Joslin2015-02-121-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWOR...Jeremy Joslin2015-02-121-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-...Jeremy Joslin2015-02-121-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | / / / / / / / / | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | |