summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am df45d644: (-s ours) am 5c7e4d99: (-s ours) Merge "Import translations. DO ...Geoff Mendal2015-02-120-0/+0
|\
| * am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2015-02-120-0/+0
| |\
| | * Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-125-12/+12
| | |\
| | | * Import translations. DO NOT MERGEGeoff Mendal2015-02-125-12/+12
* | | | am a01f5457: (-s ours) am be5aa9dd: (-s ours) Merge "Import translations. DO ...Geoff Mendal2015-02-120-0/+0
|\ \ \ \ | |/ / /
| * | | am be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2015-02-120-0/+0
| |\ \ \ | | |/ /
| | * | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-128-19/+13
| | |\ \
| | | * | Import translations. DO NOT MERGEGeoff Mendal2015-02-128-19/+13
| | | |/
* | | | 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
* | | | | am 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2015-02-120-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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 "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 "Handle a missed case in query the settings provider"Svetoslav2015-02-124-22/+62
|\ \ \ \ \
| * | | | | Handle a missed case in query the settings providerSvetoslav2015-02-124-22/+62
* | | | | | am 4bbd3cb3: am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in ...Jim Miller2015-02-121-5/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 4bbd3cb3: am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in ...Jim Miller2015-02-121-5/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" in...Jim Miller2015-02-121-5/+5
| | |\ \ \ \
| | | * \ \ \ am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-devJim Miller2015-02-121-5/+5
| | | |\ \ \ \
| | | | * \ \ \ Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-devJim Miller2015-02-121-5/+5
| | | | |\ \ \ \
| | | | | * | | | Fix accessibility focus bug in statusbarJim Miller2015-02-111-5/+5
* | | | | | | | | 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 "Glop Bitmap and RoundRect clipping support"Chris Craik2015-02-1214-189/+421
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Glop Bitmap and RoundRect clipping supportChris Craik2015-02-1214-189/+421
* | | | | | | | | | Merge "Intern strings used in Sensor information."destradaa2015-02-122-9/+145
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Intern strings used in Sensor information.destradaa2015-02-102-9/+145
* | | | | | | | | | | am 615adb8b: (-s ours) am a673af77: (-s ours) Merge "Import translations. DO ...Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2015-02-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-1219-2/+21
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-1219-2/+21
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
* | | | | | | | | | | Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/...Jeremy Joslin2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWOR...Jeremy Joslin2015-02-121-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
* | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | / / / | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-devJeremy Joslin2015-02-121-0/+4
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | | * | | | | | Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-devJeremy Joslin2015-02-121-0/+4
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Update Javadoc for EXTRA_NETWORK.Jeremy Joslin2015-02-111-0/+4
| | | | | | |_|_|_|/ | | | | | |/| | | |
* | | | | | | | | | am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode in...Benjamin Franz2015-02-121-7/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode in...Benjamin Franz2015-02-121-7/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.Benjamin Franz2015-02-121-7/+6
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am c70d0e71: Fix the javadocs for lock task mode intents.Benjamin Franz2015-02-121-7/+6
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Fix the javadocs for lock task mode intents.Benjamin Franz2015-02-121-7/+6
* | | | | | | | | | am c7e48719: Merge "Remove references to persist.sys.language/country." autom...Narayan Kamath2015-02-123-20/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /