| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHand... | Bo Liu | 2014-11-25 | 1 | -0/+3 |
| |\ | |||||
| | * | Fix crash in getNativeCanvas when canvasHandle is NULL | Bo Liu | 2014-11-24 | 1 | -0/+3 |
| * | | Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesour... | Ian Rogers | 2014-11-22 | 1 | -3/+17 |
| |\ \ | |||||
| | * \ | resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp | John Reck | 2014-11-21 | 1 | -3/+17 |
| | |\ \ | | |/ | |||||
| | | * | Merge "It's super critical to call nStart" into lmp-mr1-dev | John Reck | 2014-11-21 | 1 | -3/+17 |
| | | |\ | |||||
| | | | * | It's super critical to call nStart | John Reck | 2014-11-21 | 1 | -3/+17 |
| * | | | | am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning i... | Chih-hung Hsieh | 2014-11-22 | 1 | -4/+0 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" | Chih-hung Hsieh | 2014-11-22 | 1 | -4/+0 |
| | |\ \ \ | |||||
| | | * | | | Revert "Frameworks/base: Mask Skia warning in GraphicsJNI" | Chih-hung Hsieh | 2014-11-21 | 1 | -4/+0 |
| * | | | | | am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NO... | Chris Craik | 2014-11-21 | 1 | -8/+0 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev | Chris Craik | 2014-11-21 | 1 | -8/+0 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | | * | | | Revert "Add a way to override Xfermode DO NOT MERGE" | Chris Craik | 2014-11-21 | 1 | -8/+0 |
| * | | | | | resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp | Andreas Gampe | 2014-11-21 | 104 | -1235/+926 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Merge "Frameworks/base: Consistency in core/jni" | Andreas Gampe | 2014-11-21 | 104 | -1227/+918 |
| | |\ \ \ \ | |||||
| | | * | | | | Frameworks/base: Consistency in core/jni | Andreas Gampe | 2014-11-21 | 104 | -1227/+918 |
| * | | | | | | am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header" | Andreas Gampe | 2014-11-21 | 1 | -63/+0 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge "Frameworks/base: Remove unused header" | Andreas Gampe | 2014-11-21 | 1 | -63/+0 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | | * | | | | Frameworks/base: Remove unused header | Andreas Gampe | 2014-11-20 | 1 | -63/+0 |
| * | | | | | | resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp | Dan Albert | 2014-11-20 | 18 | -95/+96 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge "Fix clang warnings in core/jni." | Dan Albert | 2014-11-20 | 18 | -89/+90 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix clang warnings in core/jni. | Dan Albert | 2014-11-20 | 18 | -89/+90 |
| | | |/ / / / | |||||
| * | | | | | | am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." | Dan Albert | 2014-11-20 | 9 | -31/+63 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Add appropriate casts for char16_t. | Dan Albert | 2014-11-20 | 9 | -31/+63 |
| | |/ / / / | |||||
| * | | | | | am a582bd4b: Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp... | Eric Laurent | 2014-11-20 | 1 | -7/+25 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev | Eric Laurent | 2014-11-19 | 1 | -7/+25 |
| | |\ \ \ \ | |||||
| | | * | | | | AudioSystem JNI: fix AudioPortConfig mask usage | Eric Laurent | 2014-11-19 | 1 | -7/+25 |
| | * | | | | | Add zygote space to Dalvik Heap | Mathieu Chartier | 2014-11-19 | 1 | -0/+1 |
| | |/ / / / | |||||
| * | | | | | am 1073f202: am 36c7f4b6: Merge "Add zygote space to Dalvik Heap" | Mathieu Chartier | 2014-11-19 | 1 | -0/+1 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Add zygote space to Dalvik Heap | Mathieu Chartier | 2014-11-19 | 1 | -0/+1 |
| * | | | | | am c3507d10: Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni" | Andreas Gampe | 2014-11-19 | 35 | -817/+501 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni" | Andreas Gampe | 2014-11-19 | 35 | -817/+501 |
| | |\ \ \ \ | |||||
| | | * | | | | Frameworks/base: Replace LOG_FATAL_IF in core/jni | Andreas Gampe | 2014-11-19 | 35 | -817/+501 |
| * | | | | | | am b1e4e89b: Merge "Fix incorrect usage of bool" | Chih-hung Hsieh | 2014-11-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge "Fix incorrect usage of bool" | Chih-hung Hsieh | 2014-11-19 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix incorrect usage of bool | Bernhard Rosenkränzer | 2014-11-17 | 1 | -1/+1 |
| | * | | | | | | Merge "Frameworks/base: Compiled-classes support" | Andreas Gampe | 2014-11-18 | 1 | -0/+6 |
| | |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | | * | | | | | Frameworks/base: Compiled-classes support | Andreas Gampe | 2014-11-18 | 1 | -0/+6 |
| * | | | | | | | am f1c84568: am 2a20f425: Merge "Frameworks/base: Compiled-classes support" i... | Andreas Gampe | 2014-11-18 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | | Frameworks/base: Compiled-classes support | Andreas Gampe | 2014-11-18 | 1 | -0/+6 |
| * | | | | | | | am 8462913d: Merge "Frameworks/base: Ignore unknown pragmas in core/jni" | Andreas Gampe | 2014-11-18 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | Merge "Frameworks/base: Ignore unknown pragmas in core/jni" | Andreas Gampe | 2014-11-18 | 1 | -1/+3 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Frameworks/base: Ignore unknown pragmas in core/jni | Andreas Gampe | 2014-11-18 | 1 | -1/+3 |
| | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | | am 56090472: Merge "Use standard initializers" | Chih-hung Hsieh | 2014-11-18 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge "Use standard initializers" | Chih-hung Hsieh | 2014-11-18 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | | * | | | | | Use standard initializers | Bernhard Rosenkränzer | 2014-11-17 | 1 | -2/+2 |
| | | | |/ / / | | |/| | | | |||||
| * | | | | | | am 1615731d: Merge "Fix check for PROC_QUOTES mode" | Chih-hung Hsieh | 2014-11-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge "Fix check for PROC_QUOTES mode" | Chih-hung Hsieh | 2014-11-17 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix check for PROC_QUOTES mode | Bernhard Rosenkränzer | 2014-11-17 | 1 | -1/+1 |
| | | |/ / / / | |||||
| | * | | | | | Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" | Ying Wang | 2014-11-17 | 1 | -3/+18 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | | * | | | | Frameworks/base: AndroidRuntime standalone preloaded-classes | Andreas Gampe | 2014-11-17 | 1 | -3/+18 |
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |