Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add unit tests for InputMethodSubtypeSwitchingController | Yohei Yukawa | 2014-05-01 | 4 | -40/+257 |
* | Merge "Add missing ifdefs" | John Reck | 2014-05-01 | 2 | -0/+10 |
|\ | |||||
| * | Add missing ifdefs | John Reck | 2014-04-30 | 2 | -0/+10 |
* | | am 006c2110: am 11b715da: Merge "Make touch slop region smaller for watch" in... | Mindy Pereira | 2014-04-30 | 1 | -1/+4 |
|\ \ | |||||
| * \ | am 11b715da: Merge "Make touch slop region smaller for watch" into klp-modula... | Mindy Pereira | 2014-04-30 | 1 | -1/+4 |
| |\ \ | |||||
| | * | | Make touch slop region smaller for watch | Mindy Pereira | 2014-04-30 | 1 | -1/+4 |
* | | | | am 474b0749: am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL poin... | Michael Wright | 2014-04-30 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for... | Michael Wright | 2014-04-30 | 1 | -0/+4 |
| |\ \ \ | |||||
| | * \ \ | am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSe... | Michael Wright | 2014-04-30 | 1 | -0/+4 |
| | |\ \ \ | |||||
| | | * \ \ | Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperInt... | Michael Wright | 2014-04-30 | 1 | -0/+4 |
| | | |\ \ \ | |||||
| | | | * | | | WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent | Allen Shen | 2014-04-30 | 1 | -0/+4 |
* | | | | | | | am f84493ec: am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJp... | Elliott Hughes | 2014-04-30 | 1 | -5/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp" | Elliott Hughes | 2014-04-30 | 1 | -5/+6 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp" | Elliott Hughes | 2014-04-30 | 1 | -5/+6 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge "Fix for native leaks in YuvToJpegEncoder.cpp" | Elliott Hughes | 2014-04-30 | 1 | -5/+6 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fix for native leaks in YuvToJpegEncoder.cpp | Pawel Augustyn | 2014-02-04 | 1 | -5/+6 |
| | | * | | | | | DO NOT MERGE Add invokeFunctor stub | Bo Liu | 2014-04-29 | 1 | -0/+5 |
| | | | |/ / / | | | |/| | | | |||||
| * | | | | | | am 9a76e9ba: Fix build error | Bill Yi | 2014-04-30 | 1 | -2/+5 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fix build error | Bill Yi | 2014-04-29 | 1 | -2/+5 |
| | * | | | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD | Bill Yi | 2014-04-29 | 163 | -904/+1408 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for ... | Eino-Ville Talvala | 2014-03-25 | 1 | -4/+26 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" | Kenny Root | 2014-03-25 | 4 | -34/+387 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch." | Narayan Kamath | 2014-03-25 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly s... | Gabriel Peal | 2014-03-22 | 1 | -0/+31 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceF... | Chad Brubaker | 2014-03-21 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev | Unsuk Jung | 2014-03-21 | 1 | -64/+2 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParam... | Alex Klyubin | 2014-03-21 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into... | Jeff Sharkey | 2014-03-21 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | am a6454ccb: am 49325305: Merge "Update contextual asset bar assets to avoid ... | Adam Powell | 2014-03-21 | 4 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to sat... | Vinit Deshapnde | 2014-03-20 | 2 | -0/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback co... | Wei Wang | 2014-03-20 | 1 | -5/+21 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start... | Wei Wang | 2014-03-20 | 4 | -69/+131 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2:... | Victoria Lease | 2014-03-20 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothin... | Narayan Kamath | 2014-03-20 | 1 | -11/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTo... | Jeff Brown | 2014-03-19 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on da... | Robert Greenwalt | 2014-03-19 | 1 | -0/+11 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual c... | Jeff Brown | 2014-03-19 | 64 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp... | Xia Wang | 2014-03-18 | 1 | -13/+20 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Out... | Narayan Kamath | 2014-03-18 | 1 | -7/+16 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java" | Jeff Sharkey | 2014-03-17 | 2 | -1/+19 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope" | Dave Allison | 2014-03-14 | 1 | -23/+29 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodMan... | Yohei Yukawa | 2014-03-14 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into kl... | John Spurlock | 2014-03-14 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP ... | JP Abgrall | 2014-03-14 | 1 | -0/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" int... | Chad Brubaker | 2014-03-14 | 1 | -3/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to... | Svetoslav | 2014-03-14 | 1 | -0/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 825dd9dd to klp-dev-plus-aosp | Jeff Brown | 2014-03-13 | 3 | -163/+129 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#... | Adam Powell | 2014-03-14 | 3 | -6/+42 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidR... | Narayan Kamath | 2014-03-13 | 1 | -7/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement." | Narayan Kamath | 2014-03-13 | 1 | -2/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |