| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | | | Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." | Alex Klyubin | 2015-04-16 | 2 | -3/+13 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | Add Keymaster KM_ORIGIN_UNKNOWN constant. | Alex Klyubin | 2015-04-14 | 2 | -3/+13 | |
| * | | | | | | | | | | | | am c4affce9: am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic ... | Deepanshu Gupta | 2015-04-16 | 18 | -164/+224 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-a... | Deepanshu Gupta | 2015-04-16 | 18 | -164/+224 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ | am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into ... | Deepanshu Gupta | 2015-04-16 | 18 | -164/+224 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ | am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev | Deepanshu Gupta | 2015-04-16 | 18 | -164/+224 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ \ \ | Merge changes from topic 'layoutlib-api-15' into lmp-mr1-dev | Deepanshu Gupta | 2015-04-16 | 18 | -164/+224 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * | | | | | | | | | | | Update golden image for tests. | Deepanshu Gupta | 2015-04-15 | 1 | -0/+0 | |
| | | | | | * | | | | | | | | | | | Update to using LayoutlibCallback. | Deepanshu Gupta | 2015-04-15 | 17 | -154/+190 | |
| | | | | | * | | | | | | | | | | | Remove implementation of deprecated method. | Deepanshu Gupta | 2015-04-15 | 2 | -7/+3 | |
| | | | | | * | | | | | | | | | | | Add @empty support. | Deepanshu Gupta | 2015-04-15 | 1 | -3/+31 | |
| * | | | | | | | | | | | | | | | | am 40955edf: am 14a982aa: Merge "Document hprof-conv -z" | Brian Carlstrom | 2015-04-16 | 1 | -1/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | am 14a982aa: Merge "Document hprof-conv -z" | Brian Carlstrom | 2015-04-16 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Merge "Document hprof-conv -z" | Brian Carlstrom | 2015-04-16 | 1 | -1/+5 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | Document hprof-conv -z | Brian Carlstrom | 2015-04-16 | 1 | -1/+5 | |
| | | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | | am 28a9089f: am 216d18b9: Merge "Remove IV auto-generation workaround." | Alex Klyubin | 2015-04-16 | 1 | -12/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | am 216d18b9: Merge "Remove IV auto-generation workaround." | Alex Klyubin | 2015-04-16 | 1 | -12/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | Merge "Remove IV auto-generation workaround." | Alex Klyubin | 2015-04-16 | 1 | -12/+6 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | Remove IV auto-generation workaround. | Alex Klyubin | 2015-04-15 | 1 | -12/+6 | |
| | | | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | am 2b300a99: am 782b4339: Merge "[RenderScript] typo fix in Allocation.java" | Miao Wang | 2015-04-16 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | am 782b4339: Merge "[RenderScript] typo fix in Allocation.java" | Miao Wang | 2015-04-16 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | Merge "[RenderScript] typo fix in Allocation.java" | Miao Wang | 2015-04-16 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | [RenderScript] typo fix in Allocation.java | Miao Wang | 2015-04-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | am 91d2f27b: am 7f72f747: Merge "Add BNNM intrinsic." | Tim Murray | 2015-04-15 | 3 | -0/+60 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | am 7f72f747: Merge "Add BNNM intrinsic." | Tim Murray | 2015-04-15 | 3 | -0/+60 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | Merge "Add BNNM intrinsic." | Tim Murray | 2015-04-15 | 3 | -0/+60 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | Add BNNM intrinsic. | Tim Murray | 2015-04-14 | 3 | -0/+60 | |
| * | | | | | | | | | | | | | | | | | am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from Androi... | Shawn Willden | 2015-04-15 | 1 | -5/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." | Shawn Willden | 2015-04-15 | 1 | -5/+10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." | Shawn Willden | 2015-04-15 | 1 | -5/+10 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | Unbreak obtaining symmetric keys from AndroidKeyStore. | Alex Klyubin | 2015-04-14 | 1 | -5/+10 | |
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-04-15 | 2 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | am 99e23088: am 150e0e87: Merge "fix return value scale of notifyANR()" | Michael Wright | 2015-04-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | am 150e0e87: Merge "fix return value scale of notifyANR()" | Michael Wright | 2015-04-15 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | Merge "fix return value scale of notifyANR()" | Michael Wright | 2015-04-15 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | fix return value scale of notifyANR() | baik.han | 2015-04-15 | 1 | -1/+1 | |
| | | | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | 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 e635f9b5: am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs:... | Joe Fernandez | 2015-04-15 | 28 | -46/+380 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-Re... | Joe Fernandez | 2015-04-15 | 28 | -46/+380 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to M... | Joe Fernandez | 2015-04-15 | 28 | -46/+380 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Desig... | Joe Fernandez | 2015-04-14 | 28 | -46/+380 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into ... | Joe Fernandez | 2015-04-14 | 28 | -46/+380 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | | | | | | | | Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs | Joe Fernandez | 2015-04-14 | 28 | -46/+380 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | ||||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |