Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 1ad5c813: Fix typo in TtsSpan. | John Spurlock | 2015-06-15 | 1 | -1/+1 |
|\ | |||||
| * | Fix typo in TtsSpan. | John Spurlock | 2015-06-15 | 1 | -1/+1 |
| * | cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey... | Quddus Chong | 2015-04-08 | 1 | -1/+1 |
* | | docs: Add text to JavaDocs regarding browser file access vulnerability | Joe Fernandez | 2015-04-22 | 1 | -2/+6 |
* | | DO NOT MERGE Revert "Load libraries directly from apk" | Kris Giesing | 2015-04-20 | 14 | -236/+33 |
* | | DO NOT MERGE Revert "Add android.net.IpPrefix#contains()" | Kris Giesing | 2015-04-20 | 4 | -49/+7 |
* | | am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." | Alex Klyubin | 2015-04-16 | 1 | -2/+2 |
|\ \ | |||||
| * \ | am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." | Alex Klyubin | 2015-04-16 | 1 | -2/+2 |
| |\ \ | |||||
| | * \ | Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." | Alex Klyubin | 2015-04-16 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * | | Add Keymaster KM_ORIGIN_UNKNOWN constant. | Alex Klyubin | 2015-04-14 | 1 | -2/+2 |
* | | | | | am a2607ee4: am b9a78c79: Merge "Add IV-related Keymaster error codes." | Alex Klyubin | 2015-04-16 | 1 | -0/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am b9a78c79: Merge "Add IV-related Keymaster error codes." | Alex Klyubin | 2015-04-16 | 1 | -0/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Add IV-related Keymaster error codes. | Alex Klyubin | 2015-04-15 | 1 | -0/+4 |
* | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-04-15 | 2 | -3/+3 |
* | | | | | am 895f3c27: am 6a47a861: Merge "Add getPrefixAids()." | Martijn Coenen | 2015-04-15 | 1 | -1/+14 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 6a47a861: Merge "Add getPrefixAids()." | Martijn Coenen | 2015-04-15 | 1 | -1/+14 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Add getPrefixAids()." | Martijn Coenen | 2015-04-15 | 1 | -1/+14 |
| | |\ \ \ | |||||
| | | * | | | Add getPrefixAids(). | Martijn Coenen | 2015-04-15 | 1 | -1/+14 |
* | | | | | | am d83a598c: am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()." | Hiroshi Yamauchi | 2015-04-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()." | Hiroshi Yamauchi | 2015-04-15 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fix javadoc error in Debug.getRuntimeStats(). | Hiroshi Yamauchi | 2015-04-14 | 1 | -1/+1 |
* | | | | | | am 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()." | Hiroshi Yamauchi | 2015-04-14 | 1 | -0/+90 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am e38ee9df: Merge "Add Debug.getRuntimeStat()." | Hiroshi Yamauchi | 2015-04-14 | 1 | -0/+90 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Add Debug.getRuntimeStat(). | Hiroshi Yamauchi | 2015-04-14 | 1 | -0/+90 |
| | | |/ / | | |/| | | |||||
* | | | | | am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contains()" | Erik Kline | 2015-04-14 | 4 | -7/+49 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 3312c6b9: Merge "Add android.net.IpPrefix#contains()" | Erik Kline | 2015-04-14 | 4 | -7/+49 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Add android.net.IpPrefix#contains()" | Erik Kline | 2015-04-14 | 4 | -7/+49 |
| | |\ \ \ | |||||
| | | * | | | Add android.net.IpPrefix#contains() | Erik Kline | 2015-04-14 | 4 | -7/+49 |
* | | | | | | am 1770f9cf: am 3afca74a: Merge "BatteryStats: Adds an additional condition t... | Ruchi Kandoi | 2015-04-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 3afca74a: Merge "BatteryStats: Adds an additional condition to avoid Array... | Ruchi Kandoi | 2015-04-14 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBou... | Ruchi Kandoi | 2015-04-14 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | BatteryStats: Adds an additional condition to avoid | Ruchi Kandoi | 2014-07-08 | 1 | -1/+1 |
* | | | | | | | am f265bdbf: am d1af38a4: Merge "Use JCA names for block modes, paddings, and... | Alex Klyubin | 2015-04-13 | 2 | -0/+62 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am d1af38a4: Merge "Use JCA names for block modes, paddings, and digests." | Alex Klyubin | 2015-04-13 | 2 | -0/+62 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "Use JCA names for block modes, paddings, and digests." | Alex Klyubin | 2015-04-13 | 2 | -0/+62 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Use JCA names for block modes, paddings, and digests. | Alex Klyubin | 2015-04-13 | 2 | -0/+62 |
* | | | | | | | | am bd59764a: am 8f0e0c1f: Merge "Clean-up state if we have an exception when ... | Wale Ogunwale | 2015-04-13 | 1 | -24/+42 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring pro... | Wale Ogunwale | 2015-04-13 | 1 | -24/+42 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge "Clean-up state if we have an exception when acquiring provider" | Wale Ogunwale | 2015-04-13 | 1 | -24/+42 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | | * | | | | | Clean-up state if we have an exception when acquiring provider | Wale Ogunwale | 2015-04-10 | 1 | -24/+42 |
* | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-04-10 | 5 | -15/+15 |
* | | | | | | | | am 99f4ac14: am 97fce66f: Merge "Make several key crypto parameters repeatable" | Shawn Willden | 2015-04-10 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 97fce66f: Merge "Make several key crypto parameters repeatable" | Shawn Willden | 2015-04-10 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Make several key crypto parameters repeatable | Chad Brubaker | 2015-04-10 | 1 | -6/+6 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | am c5f9683c: am a270264c: Merge "Track more changes to keymaster_defs.h" | Alex Klyubin | 2015-04-10 | 1 | -18/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am a270264c: Merge "Track more changes to keymaster_defs.h" | Alex Klyubin | 2015-04-10 | 1 | -18/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Track more changes to keymaster_defs.h | Alex Klyubin | 2015-04-10 | 1 | -18/+1 |
* | | | | | | | am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes." | Alex Klyubin | 2015-04-10 | 1 | -19/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am ba2836e6: Merge "Track recent keymaster_defs.h changes." | Alex Klyubin | 2015-04-10 | 1 | -19/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Track recent keymaster_defs.h changes. | Alex Klyubin | 2015-04-09 | 1 | -19/+1 |
| | |/ / / / |