summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."Narayan Kamath2014-05-011-0/+22
|\
| * am b916d8ad: Merge "Implement FileUtils#contains."Narayan Kamath2014-05-011-0/+22
| |\
| | * Implement FileUtils#contains.Narayan Kamath2014-05-011-0/+22
* | | am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for...Michael Wright2014-04-301-0/+4
|\ \ \ | |/ /
| * | am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSe...Michael Wright2014-04-301-0/+4
| |\ \ | | |/
| | * Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperInt...Michael Wright2014-04-301-0/+4
| | |\
| | | * WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntentAllen Shen2014-04-301-0/+4
| | * | DO NOT MERGE Add invokeFunctor stubBo Liu2014-04-291-0/+5
| | |/
* | | am 9a76e9ba: Fix build errorBill Yi2014-04-301-2/+5
|\ \ \ | |/ /
| * | Fix build errorBill Yi2014-04-291-2/+5
| * | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-2970-653/+1103
| |\ \ | | |/ | |/|
| | * am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for ...Eino-Ville Talvala2014-03-251-4/+26
| | |\
| | * \ am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"Kenny Root2014-03-254-34/+387
| | |\ \
| | * \ \ am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly s...Gabriel Peal2014-03-221-0/+31
| | |\ \ \
| | * \ \ \ am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceF...Chad Brubaker2014-03-211-1/+1
| | |\ \ \ \
| | * \ \ \ \ am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-devUnsuk Jung2014-03-211-64/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParam...Alex Klyubin2014-03-211-2/+2
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback co...Wei Wang2014-03-201-5/+21
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start...Wei Wang2014-03-204-69/+131
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTo...Jeff Brown2014-03-191-1/+1
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on da...Robert Greenwalt2014-03-191-0/+11
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"Jeff Sharkey2014-03-171-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodMan...Yohei Yukawa2014-03-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into kl...John Spurlock2014-03-141-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP ...JP Abgrall2014-03-141-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" int...Chad Brubaker2014-03-141-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to...Svetoslav2014-03-141-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 825dd9dd to klp-dev-plus-aospJeff Brown2014-03-133-163/+129
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#...Adam Powell2014-03-141-6/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."Narayan Kamath2014-03-131-2/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar"Jeff Brown2014-03-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation"Jeff Brown2014-03-132-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra ...Jeff Brown2014-03-131-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1011960c: am decfd707: Merge "Add the calling package name to requestRoute...Chad Brubaker2014-03-123-7/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the Fast...Alan Viverette2014-03-112-16/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-bindi...Alan Viverette2014-03-111-4/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views ar...Alan Viverette2014-03-111-73/+92
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority hand...Adam Powell2014-03-112-3/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."Dave Allison2014-03-111-2/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes."Narayan Kamath2014-03-114-0/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception...Martijn Coenen2014-03-111-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference c...Dave Platt2014-03-111-19/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally."Narayan Kamath2014-03-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9e413bf4: am bbfc08b3: Merge changes I6d4fdada,Ia34899a4Greg Hackmann2014-03-102-2/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docsJohn 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 96192157: am f175b19a: Merge "Fix a bug where OnTouchListeners in action v...Adam Powell2014-03-081-18/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()."Elliott Hughes2014-03-081-4/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."Elliott Hughes2014-03-084-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"Narayan Kamath2014-03-081-48/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-03-27 21:27:02 +0000