summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* The voice assist may now be launched above the lockscreenSelim Cinek2015-05-056-0/+46
* Merge changes from topic 'mwd-merge-050415' into mnc-devPrerepa Viswanadham2015-05-0528-65/+283
|\
| * Merge commit 'b6f59f4' into master_mergePrerepa Viswanadham2015-05-011-0/+5
| |\
| | * Merge "IMS-VT: Enable video calls" into m-wireless-devEtan Cohen2015-04-291-0/+5
| | |\
| | | * IMS-VT: Enable video callsRekha Kumar2015-04-071-0/+5
| * | | Merge commit '17455a3' into master_mergePrerepa Viswanadham2015-05-012-9/+77
| |\ \ \ | | |/ /
| | * | add a parameter to carrier messaging calls to request delivery statusCheuksan Wang2015-04-242-9/+77
| * | | Merge commit 'eba66c3' into master_mergePrerepa Viswanadham2015-05-012-13/+4
| |\ \ \ | | |/ /
| | * | Make onlost/onfound APIs publicPrerepa Viswanadham2015-04-222-13/+4
| | * | Merge "Final removal of CONNECTIVITY_ACTION_IMMEDIATE." into m-wireless-devErik Kline2015-04-222-10/+1
| | |\ \
| | | * | Final removal of CONNECTIVITY_ACTION_IMMEDIATE.Erik Kline2015-04-222-10/+1
| * | | | am 4ee45178: am dbb03371: am 6e761c5d: Merge "Device policy: use owner label ...Robin Lee2015-05-011-3/+3
| |\ \ \ \
| | * \ \ \ am dbb03371: am 6e761c5d: Merge "Device policy: use owner label instead of na...Robin Lee2015-05-011-3/+3
| | |\ \ \ \
| | | * \ \ \ am 6e761c5d: Merge "Device policy: use owner label instead of name" into mnc-devRobin Lee2015-05-011-3/+3
| | | |\ \ \ \
| * | | \ \ \ \ am c2b1f93c: am 2d7d9523: am a78240ba: AlarmManager: Reject non-olson timezon...Narayan Kamath2015-05-011-6/+37
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 2d7d9523: am a78240ba: AlarmManager: Reject non-olson timezones for target...Narayan Kamath2015-05-011-6/+37
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am a78240ba: AlarmManager: Reject non-olson timezones for targetSdk >= MNarayan Kamath2015-05-011-6/+37
| | | |\ \ \ \ \
| * | | \ \ \ \ \ am 17004d63: am 342c22a5: am f2cfe6c0: Merge "Fix a bug in ScanSettings const...Wei Wang2015-05-011-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 342c22a5: am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into...Wei Wang2015-05-011-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-devWei Wang2015-05-011-1/+1
| | | |\ \ \ \ \ \
| * | | \ \ \ \ \ \ am cf6f4e4e: am 25e99ce6: am 043d7a94: am 12b1b8ed: am 026e204e: Fixes veloci...Gus Prevas2015-05-011-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 25e99ce6: am 043d7a94: am 12b1b8ed: am 026e204e: Fixes velocity tracking b...Gus Prevas2015-05-011-0/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am 043d7a94: am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDi...Gus Prevas2015-05-011-0/+2
| | | |\ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ am c869bbfd: am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings fro...Wei Wang2015-05-012-22/+11
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings from Settings UI...Wei Wang2015-05-012-22/+11
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-devWei Wang2015-05-012-22/+11
| | | |\ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ am ad44d814: am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I249...Lorenzo Colitti2015-05-012-82/+82
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d...Lorenzo Colitti2015-05-012-82/+82
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-devLorenzo Colitti2015-05-012-82/+82
| | | |\ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ am 129a0b8b: am 94d7494a: am 56c58a2e: Merge "Fix typo. bug: b/20610710" into...tturney2015-05-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 94d7494a: am 56c58a2e: Merge "Fix typo. bug: b/20610710" into mnc-devtturney2015-05-011-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am 56c58a2e: Merge "Fix typo. bug: b/20610710" into mnc-devtturney2015-05-011-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ am 4cff05e1: am 87706358: am ac7927a8: Merge "LayoutInflater should always tr...Alan Viverette2015-05-012-19/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 87706358: am ac7927a8: Merge "LayoutInflater should always try to generate...Alan Viverette2015-04-302-19/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | am ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams...Alan Viverette2015-04-302-19/+14
| | | |\ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ am c89e1a96: am c8b068ce: am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PR...Alex Klyubin2015-05-011-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am c8b068ce: am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." in...Alex Klyubin2015-04-301-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-devAlex Klyubin2015-04-301-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are acc...John Reck2015-05-019-33/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a fe...John Reck2015-04-309-33/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" int...John Reck2015-04-309-33/+49
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ am c9122d6f: am 07a2ebd3: am 0069301d: Merge "Fix thread affinity of Fingerpr...Alex Klyubin2015-05-011-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 07a2ebd3: am 0069301d: Merge "Fix thread affinity of FingerprintManager." ...Alex Klyubin2015-04-301-1/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | am 0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-devAlex Klyubin2015-04-301-1/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9c14b3ab: am c7e9a17a: am 10a54a79: Merge "Remove dependency upon Fragment...Todd Kennedy2015-05-019-256/+987
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am c7e9a17a: am 10a54a79: Merge "Remove dependency upon FragmentActivity" int...Todd Kennedy2015-04-309-256/+987
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | am 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-devTodd Kennedy2015-04-309-256/+987
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "resolved conflicts for merge of 04f2fe39 to master"Mady Mellor2015-05-0112-8/+269
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 04f2fe39 to masterMady Mellor2015-04-3012-8/+269
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | am d73f05f5: am 2619ef39: Merge "Add onStylusButtonPress listener to View" in...Mady Mellor2015-04-3012-8/+270
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / /