summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix tab/space inconsistencies in stk_msg_dialog.xmlHEADmasterDavid Pursehouse2015-12-061-30/+29
* DO NOT MERGE Change to add STK_PERMISSION for stk related commands.Amit Mahajan2015-10-181-0/+1
* Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/pa...Steve Kondik2012-11-185-18/+24
|\
| * More issue #7226656 second user seeing primary user's appsDianne Hackborn2012-09-281-1/+3
| * Fix mVibrator initialization.Wink Saville2012-09-261-2/+4
| * am 8e36a0a6: am 3420f3cc: Merge "No response sent when backlight is OFF"Wink Saville2012-09-141-2/+5
| |\
| | * am 3420f3cc: Merge "No response sent when backlight is OFF"Wink Saville2012-09-141-2/+5
| | |\
| | | * Merge "No response sent when backlight is OFF"Wink Saville2012-09-141-2/+5
| | | |\
| | | | * No response sent when backlight is OFFPierre Fröjd2012-09-131-2/+5
| | | |/
| * | | am 558abb1d: am af0dd9f0: Merge "Stk: Fix crash due to race condition"Wink Saville2012-08-081-11/+11
| |\ \ \ | | |/ /
| | * | am af0dd9f0: Merge "Stk: Fix crash due to race condition"Wink Saville2012-08-081-11/+11
| | |\ \ | | | |/
| | | * Merge "Stk: Fix crash due to race condition"Wink Saville2012-08-081-11/+11
| | | |\
| | | | * Stk: Fix crash due to race conditionAlex Yakavenka2012-07-271-11/+11
| | | |/
| * | | Import translations. DO NOT MERGEYing Wang2012-07-201-1/+1
| * | | am 1234f0b4: (-s ours) am 71013cbd: (-s ours) Use telephony-common - DO NOT M...Wink Saville2012-07-170-0/+0
| |\ \ \ | | |/ /
| | * | am 71013cbd: (-s ours) Use telephony-common - DO NOT MERGEWink Saville2012-07-170-0/+0
| | |\ \ | | | |/
| | | * Use telephony-common - DO NOT MERGEWink Saville2012-07-171-0/+1
| * | | Merge commit '401a3cf1' into mitWink Saville2012-07-121-0/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Use telephony-commonWink Saville2012-06-111-0/+1
| |/
* | Fixing Stk app crash, System service created too early.tbalden2012-08-071-2/+4
|/
* Merge "Get Vibrator from Context instead of using private API."Jeff Brown2012-04-131-1/+1
|\
| * Get Vibrator from Context instead of using private API.Jeff Brown2012-04-131-1/+1
* | Import translations. DO NOT MERGEEric Fischer2012-04-131-1/+1
|/
* Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\
| * am 7c82ced5: Import translations. DO NOT MERGEEric Fischer2012-02-1049-1/+351
| |\
| * \ am d9925af4: Merge "Fix crash in STK." into ics-mr1Wink Saville2012-01-041-8/+4
| |\ \
| * \ \ am 764167cd: Add support of dislaying Alpha tag for BIP commandsKazuhiro Ondo2012-01-042-0/+143
| |\ \ \
| * \ \ \ am cea52ec4: Import revised translations. DO NOT MERGEEric Fischer2011-11-291-1/+1
| |\ \ \ \
| * \ \ \ \ am 2a0eb2ac: Update STK applicationdujin.cha2011-11-211-2/+4
| |\ \ \ \ \
| * \ \ \ \ \ am 60ead5ef: Import revised translations. DO NOT MERGEEric Fischer2011-11-211-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 11320079: resolved conflicts for merge of 486c1d0d to ics-mr1Jake Hamby2011-11-031-1/+17
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am dfd14622: am 046db4be: Fix NPE in STK application.Wink Saville2011-11-021-0/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am a742d994: Import revised translations.Eric Fischer2011-11-012-0/+70
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 7c03cfef: Fix crash in STK app when launching browserDavid Brown2011-10-241-8/+13
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 8e2c5d31: Merge "Import revised translations."Eric Fischer2011-10-181-0/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | am 24e8efcc: (-s ours) am 5a592c64: (-s ours) Import revised translations. D...Eric Fischer2011-10-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 3aaefdeb: Import revised translations.Eric Fischer2011-10-101-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 9bb09da3: Import revised translations.Eric Fischer2011-09-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8d3aaaca: (-s ours) am f9e385f3: (-s ours) Import revised translations. D...Eric Fischer2011-09-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c3c0ef97: Import revised translations.Eric Fischer2011-09-204-0/+140
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 45e1a2eb: (-s ours) am d91b1bd4: (-s ours) Import revised translations. D...Eric Fischer2011-09-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-231-1/+1
* | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-081-2/+2
* | | | | | | | | | | | | | | | | | | | am 7c82ced5: (-s ours) Import translations. DO NOT MERGEEric Fischer2012-02-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-0849-1/+351
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-01-301-2/+2
* | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-01-2649-0/+350