summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add addional scale component for radialDistortion.Ruben Brunk2015-06-152-6/+6
* Merge "Limit shared element transition to shared elements and children." into...George Mount2015-06-151-19/+83
|\
| * Limit shared element transition to shared elements and children.George Mount2015-06-111-19/+83
* | Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into ...Vladislav Kaznacheev2015-06-151-4/+11
|\ \
| * | Revert "Make VPA.setInterpolator(null) unset the interpolator."Vladislav Kaznacheev2015-06-151-4/+11
* | | Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" i...Adam Powell2015-06-151-8/+21
|\ \ \
| * | | Only read foreground attr for FrameLayouts for targetSdkVersion < MAdam Powell2015-06-121-8/+21
* | | | Merge "Only re-register callbacks if tuning changed" into mnc-devJason Monk2015-06-151-8/+15
|\ \ \ \
| * | | | Only re-register callbacks if tuning changedJason Monk2015-06-151-8/+15
* | | | | Merge "Fix EmergencyCallback in NetworkController" into mnc-devJason Monk2015-06-157-33/+102
|\ \ \ \ \
| * | | | | Fix EmergencyCallback in NetworkControllerJason Monk2015-06-117-33/+102
* | | | | | Merge "Fix issue #21813831: Need API for asking to be added to power whitelis...Dianne Hackborn2015-06-159-12/+58
|\ \ \ \ \ \
| * | | | | | Fix issue #21813831: Need API for asking to be added to power whitelistDianne Hackborn2015-06-159-12/+58
* | | | | | | Merge "Obtain handler from context in CaptioningManager" into mnc-devAlan Viverette2015-06-151-5/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Obtain handler from context in CaptioningManagerAlan Viverette2015-06-051-5/+14
* | | | | | | Merge "Use HTTPS when fetching app link verification resources" into mnc-devChristopher Tate2015-06-151-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Use HTTPS when fetching app link verification resourcesChristopher Tate2015-06-121-2/+1
* | | | | | | | Merge "Retry intent verification 3 times before failing." into mnc-devJoseph Wen2015-06-152-3/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | Retry intent verification 3 times before failing.Joseph Wen2015-06-152-3/+40
* | | | | | | | | Merge "Remove EcIesParameterSpec until it's needed." into mnc-devAlex Klyubin2015-06-153-320/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove EcIesParameterSpec until it's needed.Alex Klyubin2015-06-153-320/+0
* | | | | | | | | | Merge "Document when self-signed certs have invalid signature." into mnc-devAlex Klyubin2015-06-152-1/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Document when self-signed certs have invalid signature.Alex Klyubin2015-06-122-1/+9
* | | | | | | | | | | Merge "Add adb shell telecom get-system-dialer" into mnc-devYorke Lee2015-06-151-2/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add adb shell telecom get-system-dialerYorke Lee2015-06-111-2/+13
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-1577-2411/+2821
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-1577-2411/+2821
* | | | | | | | | | | | am fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix f...Diego Perez2015-06-152-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on...Diego Perez2015-06-152-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor...Diego Perez2015-06-152-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr...Diego Perez2015-06-152-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-devDiego Perez2015-06-152-2/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Fix for shadows on theme editor" into lmp-mr1-devDiego Perez2015-06-152-2/+6
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Fix for shadows on theme editorDiego Perez2015-06-022-2/+6
* | | | | | | | | | | | | | | | | | am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix G...Diego Perez2015-06-151-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot dra...Diego Perez2015-06-151-2/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when...Diego Perez2015-06-151-2/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is ...Diego Perez2015-06-151-2/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into l...Diego Perez2015-06-151-2/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-devDiego Perez2015-06-151-2/+13
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | Fix GcSnapshot drawInLayer when clipping is used.Diego Perez2015-05-071-2/+13
* | | | | | | | | | | | | | | | | | | am c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs ...Dirk Dougherty2015-06-15126-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into m...Dirk Dougherty2015-06-13126-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docsDirk Dougherty2015-06-13126-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Doc change: move ndk docs jd into main docs tree.Dirk Dougherty2015-06-12126-0/+0
* | | | | | | | | | | | | | | | | | | | | am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work"...Andrew Solovay2015-06-153-9/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page...Andrew Solovay2015-06-123-9/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-pr...Andrew Solovay2015-06-123-9/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | docs: Added AfW videos to "Android for Work" landing pageAndrew Solovay2015-06-093-9/+45
* | | | | | | | | | | | | | | | | | | | | | am afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" int...Rich Slogar2015-06-151-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /