summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."Narayan Kamath2014-03-131-2/+0
|\
| * Merge "Remove stray logging statement."Narayan Kamath2014-03-111-2/+0
| |\
| | * Remove stray logging statement.Narayan Kamath2014-03-111-2/+0
* | | am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar"Jeff Brown2014-03-131-1/+1
|\ \ \ | |/ /
| * | Merge "Round off when calculate next step in Seekbar"Jeff Brown2014-03-111-1/+1
| |\ \
| | * | Round off when calculate next step in SeekbarMarcus Danielsson2014-01-201-1/+1
* | | | am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation"Jeff Brown2014-03-132-3/+3
|\ \ \ \ | |/ / /
| * | | Merge "Fixed typo errors in documentation"Jeff Brown2014-03-112-3/+3
| |\ \ \
| | * | | Fixed typo errors in documentationTaeho Kim2013-10-292-3/+3
* | | | | am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra ...Jeff Brown2014-03-131-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "take account of RotationVector's new extra parameter"Jeff Brown2014-03-111-2/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | take account of RotationVector's new extra parameterBalint Ureczky2013-12-061-2/+2
* | | | | am 1011960c: am decfd707: Merge "Add the calling package name to requestRoute...Chad Brubaker2014-03-123-7/+11
|\ \ \ \ \
| * \ \ \ \ am decfd707: Merge "Add the calling package name to requestRouteToHost" into ...Chad Brubaker2014-03-113-7/+11
| |\ \ \ \ \
| | * \ \ \ \ Merge "Add the calling package name to requestRouteToHost" into klp-devChad Brubaker2014-03-113-7/+11
| | |\ \ \ \ \
| | | * | | | | Add the calling package name to requestRouteToHostChad Brubaker2014-03-053-7/+11
* | | | | | | | am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the Fast...Alan Viverette2014-03-112-16/+25
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long...Alan Viverette2014-03-112-16/+25
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "DO NOT MERGE Quick fix for updating the FastScroller long list propert...Alan Viverette2014-03-112-16/+25
| | |\ \ \ \ \ \
| | | * | | | | | DO NOT MERGE Quick fix for updating the FastScroller long list propertyAlan Viverette2014-03-072-16/+25
* | | | | | | | | am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-bindi...Alan Viverette2014-03-111-4/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient ...Alan Viverette2014-03-111-4/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "DO NOT MERGE Check item type before re-binding transient state views" ...Alan Viverette2014-03-111-4/+10
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | DO NOT MERGE Check item type before re-binding transient state viewsAlan Viverette2014-03-071-4/+10
* | | | | | | | | am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views ar...Alan Viverette2014-03-111-73/+92
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily...Alan Viverette2014-03-111-73/+92
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "DO NOT MERGE Ensure transient state views are temporarily detached" in...Alan Viverette2014-03-111-73/+92
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | DO NOT MERGE Ensure transient state views are temporarily detachedAlan Viverette2014-03-071-73/+92
* | | | | | | | | am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority hand...Adam Powell2014-03-112-3/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into kl...Adam Powell2014-03-112-3/+13
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix a bug in submenu presenter priority handlingAdam Powell2014-03-102-3/+13
* | | | | | | | | am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."Dave Allison2014-03-111-2/+36
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | ART profiler usage.Dave Allison2014-03-071-2/+36
* | | | | | | | | am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes."Narayan Kamath2014-03-114-0/+42
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Inform libcore of time format pref. changes.Narayan Kamath2014-03-074-0/+42
* | | | | | | | | am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception...Martijn Coenen2014-03-111-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "NFC: getNdefMessage() should throw exception if no tag in field."Martijn Coenen2014-03-061-0/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | NFC: getNdefMessage() should throw exception if no tag in field.Mathias Jeppsson2014-01-281-0/+2
* | | | | | | | | | am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference c...Dave Platt2014-03-111-19/+28
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Harden NsdManager against null-dereference crashesDave Platt2014-03-041-19/+28
| * | | | | | | | | Fix descriptor leak after accepting connectionsDave Platt2014-02-281-1/+1
* | | | | | | | | | am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally."Narayan Kamath2014-03-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Make getAssetInt throw unconditionally.Narayan Kamath2014-02-251-1/+1
* | | | | | | | | | am 9e413bf4: am bbfc08b3: Merge changes I6d4fdada,Ia34899a4Greg Hackmann2014-03-102-2/+23
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge changes I6d4fdada,Ia34899a4Greg Hackmann2014-02-212-2/+23
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Move time setting code from SystemClock to AlarmManagerServiceGreg Hackmann2014-02-212-2/+23
* | | | | | | | | | | am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docsJohn Spurlock2014-03-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docsJohn Spurlock2014-03-101-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix doc typos in Vibrator.javaJohn Spurlock2014-03-101-2/+2
* | | | | | | | | | | | am 0ea81eed: am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add ...Wei Wang2014-03-088-93/+394
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /