| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | resolved conflicts for merge of d0694da4 to mnc-dr-dev | Tyler Gunn | 2015-07-31 | 4 | -8/+36 |
| |\ | |||||
| | * | Merge "Add telecom extra keys required for DMR release." into mnc-dev | Tyler Gunn | 2015-07-31 | 4 | -0/+38 |
| | |\ | |||||
| | | * | Add telecom extra keys required for DMR release. | Tyler Gunn | 2015-07-30 | 4 | -0/+38 |
| * | | | am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev | Julia Reynolds | 2015-07-31 | 1 | -10/+12 |
| |\ \ \ | |/ / | |||||
| | * | | Merge "Fix SysUI crash on device boot." into mnc-dev | Julia Reynolds | 2015-07-31 | 1 | -10/+12 |
| | |\ \ | |||||
| | | * | | Fix SysUI crash on device boot. | Julia Reynolds | 2015-07-31 | 1 | -10/+12 |
| * | | | | am 9a81a182: Merge "Don\'t always transfer device owner status to other users... | Rubin Xu | 2015-07-31 | 1 | -2/+15 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge "Don't always transfer device owner status to other users." into mnc-dev | Rubin Xu | 2015-07-31 | 1 | -2/+15 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | Don't always transfer device owner status to other users. | Nicolas Prevot | 2015-07-31 | 1 | -2/+15 |
| * | | | | am d692fcf1: Merge "Add missing return statement" into mnc-dev | Benjamin Franz | 2015-07-31 | 1 | -0/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge "Add missing return statement" into mnc-dev | Benjamin Franz | 2015-07-31 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * | | | Add missing return statement | Benjamin Franz | 2015-07-30 | 1 | -0/+1 |
| * | | | | | am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing method... | Lorenzo Colitti | 2015-07-31 | 3 | -5/+74 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge "Stop supporting legacy ConnectivityManager routing methods in M." into... | Lorenzo Colitti | 2015-07-31 | 3 | -5/+74 |
| | |\ \ \ \ | |||||
| | | * | | | | Stop supporting legacy ConnectivityManager routing methods in M. | Lorenzo Colitti | 2015-07-31 | 3 | -5/+74 |
| * | | | | | | am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into m... | Dave Langemak | 2015-07-31 | 2 | -1/+6 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge changes from topic 'fix-notification-inflation-2' into mnc-dev | Dave Langemak | 2015-07-31 | 2 | -1/+6 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Make DateTimeView more robust to weird contexts. | Dan Sandler | 2015-07-30 | 1 | -1/+2 |
| | | * | | | | | Make the RemoteViews context safe for Icons. | Dan Sandler | 2015-07-30 | 1 | -0/+4 |
| * | | | | | | | am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev | Hung-ying Tyan | 2015-07-31 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev | Hung-ying Tyan | 2015-07-31 | 1 | -1/+4 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Revise lockdown check in getLegacyVpnInfo() | Hung-ying Tyan | 2015-07-30 | 1 | -1/+4 |
| * | | | | | | | | am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev | Geoff Mendal | 2015-07-31 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev | Geoff Mendal | 2015-07-31 | 78 | -43/+199 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-30 | 78 | -43/+199 |
| | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | | am e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev | Ronghua Wu | 2015-07-31 | 1 | -5/+10 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | Merge "media: use blocks number to find closest size" into mnc-dev | Ronghua Wu | 2015-07-31 | 1 | -5/+10 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | | * | | | | | | media: use blocks number to find closest size | Ronghua Wu | 2015-07-30 | 1 | -5/+10 |
| | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-30 | 78 | -49/+107 |
| * | | | | | | | am 5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev | Jeff Sharkey | 2015-07-31 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge "Handle volumes without visible paths." into mnc-dev | Jeff Sharkey | 2015-07-31 | 1 | -1/+5 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Handle volumes without visible paths. | Jeff Sharkey | 2015-07-30 | 1 | -1/+5 |
| * | | | | | | | | am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev | Adam Lesinski | 2015-07-31 | 1 | -18/+52 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | Merge "AAPT: Fix resource versioning" into mnc-dev | Adam Lesinski | 2015-07-31 | 1 | -18/+52 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | AAPT: Fix resource versioning | Adam Lesinski | 2015-07-28 | 1 | -18/+52 |
| * | | | | | | | | | am b9f30b26: Merge "The heads up now correctly dissapears when clicking" into... | Selim Cinek | 2015-07-31 | 7 | -2/+41 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge "The heads up now correctly dissapears when clicking" into mnc-dev | Selim Cinek | 2015-07-30 | 7 | -2/+41 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | The heads up now correctly dissapears when clicking | Selim Cinek | 2015-07-30 | 7 | -2/+41 |
| * | | | | | | | | | | am 53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev | Amit Mahajan | 2015-07-30 | 2 | -10/+13 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "Add OrSelf to privileged permission check." into mnc-dev | Amit Mahajan | 2015-07-30 | 2 | -10/+13 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Add OrSelf to privileged permission check. | Amit Mahajan | 2015-07-30 | 2 | -10/+13 |
| | | |/ / / / / / / / | |||||
| * | | | | | | | | | | am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unkno... | Adam Lesinski | 2015-07-30 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "BatteryStats: include mobile radio active count and unknown time in ch... | Adam Lesinski | 2015-07-30 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | BatteryStats: include mobile radio active count and unknown time in checkin | Adam Lesinski | 2015-07-30 | 1 | -1/+3 |
| * | | | | | | | | | | | am 3bf1ac54: Bluetooth: Don\'t call beginBroadcast() while in a broadcast | Andre Eisenbach | 2015-07-30 | 1 | -41/+71 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Bluetooth: Don't call beginBroadcast() while in a broadcast | Andre Eisenbach | 2015-07-30 | 1 | -41/+71 |
| | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | | am 26ae600b: Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev | Carlos Valdivia | 2015-07-30 | 3 | -127/+199 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev | Carlos Valdivia | 2015-07-30 | 3 | -127/+199 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Permissions: GET_ACCOUNTS permission cleanup | Carlos Valdivia | 2015-07-30 | 3 | -127/+199 |
| * | | | | | | | | | | | am 7676e403: Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6,... | Deepanshu Gupta | 2015-07-30 | 9 | -44/+112 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |