| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | | | Merge "Manual merge of changes from klp-dev" | Deepanshu Gupta | 2014-01-30 | 9 | -99/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Manual merge of changes from klp-dev | Deepanshu Gupta | 2014-01-29 | 9 | -99/+44 | |
| * | | | | | | | | | | | | | am 310b1e51: am af5b2d3f: am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc f... | Adam Koch | 2014-01-30 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | / / / / / / / / / | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | am af5b2d3f: am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc fix: Update co... | Adam Koch | 2014-01-29 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | | am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in... | Adam Koch | 2014-01-29 | 1 | -1/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | ||||||
| | | | * | | | | | | | | | am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying b... | Adam Koch | 2014-01-29 | 1 | -1/+2 | |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | | | ||||||
| | | | | * | | | | | | | | am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps traini... | Adam Koch | 2014-01-29 | 1 | -1/+2 | |
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / | | | | | |/| | | | | | | ||||||
| | | | | | * | | | | | | | Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:... | Adam Koch | 2014-01-29 | 1 | -1/+2 | |
| | | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | | | * | | | | | | | Doc fix: Update code snippet in displaying bitmaps training class | Adam Koch | 2014-01-29 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | Merge "Merge close vertices in a better way." | ztenghui | 2014-01-29 | 2 | -23/+178 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Merge close vertices in a better way. | ztenghui | 2014-01-29 | 2 | -23/+178 | |
| * | | | | | | | | | | | | | | Merge "Fix build breakage" | Chris Craik | 2014-01-29 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Fix build breakage | Chris Craik | 2014-01-29 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | Merge "Update reordering method names, and make 3d reordering API public" | Chris Craik | 2014-01-29 | 14 | -50/+162 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | Update reordering method names, and make 3d reordering API public | Chris Craik | 2014-01-29 | 14 | -50/+162 | |
| * | | | | | | | | | | | | | | | Merge "Adapt to underlying changes in the PBKDF2 implementation" | Christopher Tate | 2014-01-29 | 4 | -84/+187 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Adapt to underlying changes in the PBKDF2 implementation | Christopher Tate | 2014-01-16 | 4 | -84/+187 | |
| * | | | | | | | | | | | | | | | Merge "Fix projection offset caching" | Chris Craik | 2014-01-29 | 2 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Fix projection offset caching | Chris Craik | 2014-01-29 | 2 | -1/+3 | |
| * | | | | | | | | | | | | | | | | Merge "change Surface constructor arg to 64bit" | Chong Zhang | 2014-01-29 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | change Surface constructor arg to 64bit | Chong Zhang | 2014-01-29 | 1 | -1/+2 | |
| | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge "Fix NPE in empty SizeAdaptiveLayouts." | Dan Sandler | 2014-01-29 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Fix NPE in empty SizeAdaptiveLayouts. | Dan Sandler | 2014-01-24 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | | | | | am 2ad24e74: am 15c09e1e: am 0dbcd7d9: am 2d35ba4d: am d12f4eb8: Merge "[Navi... | John Spurlock | 2014-01-29 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | / / / / / | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | am 15c09e1e: am 0dbcd7d9: am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] A... | John Spurlock | 2014-01-29 | 1 | -0/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | am 0dbcd7d9: am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right t... | John Spurlock | 2014-01-29 | 1 | -0/+5 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gestu... | John Spurlock | 2014-01-29 | 1 | -0/+5 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ | am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch ... | John Spurlock | 2014-01-29 | 1 | -0/+5 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge "[Navigation bar] Allow "right to left" gesture to launch search panel" | John Spurlock | 2014-01-29 | 1 | -0/+5 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | * | | | | | | | | | | | | | [Navigation bar] Allow "right to left" gesture to launch search panel | fisherson_lin | 2014-01-29 | 1 | -0/+5 | |
| * | | | | | | | | | | | | | | | | | | | Merge "Path.native_trim should return long, not int." | Narayan Kamath | 2014-01-29 | 2 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | Path.native_trim should return long, not int. | Narayan Kamath | 2014-01-29 | 2 | -5/+5 | |
| | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | am 1a6e29aa: am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNati... | Narayan Kamath | 2014-01-29 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is l... | Narayan Kamath | 2014-01-29 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int." | Narayan Kamath | 2014-01-29 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int." | Narayan Kamath | 2014-01-29 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | am d228a038: Merge "mNativeCanvas is long, not int." | Narayan Kamath | 2014-01-29 | 1 | -1/+1 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | | | | | | | | | Merge "mNativeCanvas is long, not int." | Narayan Kamath | 2014-01-29 | 1 | -1/+1 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | * | | | | | | | | | | | | | | mNativeCanvas is long, not int. | Narayan Kamath | 2014-01-29 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | Merge "AArch64: Use of long for pointers in PropertyValuesHolder" | Narayan Kamath | 2014-01-29 | 3 | -84/+84 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | AArch64: Use of long for pointers in PropertyValuesHolder | Ashok Bhat | 2014-01-29 | 3 | -84/+84 | |
| | | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge "Allow for a configurable WiFi restore bounce delay" | Evan Charlton | 2014-01-29 | 2 | -1/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Allow for a configurable WiFi restore bounce delay | Evan Charlton | 2014-01-15 | 2 | -1/+15 | |
| | | |_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | am 1caea796: am c74f7619: am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch... | Narayan Kamath | 2014-01-29 | 2 | -21/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | am c74f7619: am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long ... | Narayan Kamath | 2014-01-29 | 2 | -21/+26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers ... | Narayan Kamath | 2014-01-29 | 2 | -21/+26 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/I... | Narayan Kamath | 2014-01-29 | 2 | -21/+26 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator" | Narayan Kamath | 2014-01-29 | 2 | -21/+26 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | | | | | | | | | | Merge "AArch64: Use long for pointers in graphics/Interpolator" | Narayan Kamath | 2014-01-29 | 2 | -21/+26 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | * | | | | | | | | | | | | | | | AArch64: Use long for pointers in graphics/Interpolator | Ashok Bhat | 2014-01-16 | 2 | -21/+26 | |
| | | | | | | | |_|_|/ / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | ||||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |