summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/pa...staging/cm-13.0+r22Steve Kondik2016-03-105-8/+6
|\
| * am 879da353: (-s ours) am e57e462a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\
| | * am e57e462a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\
| * | | am 7b95f245: am 44c11d01: Merge "Stk: Icon related changes" into mnc-dr-devAmit Mahajan2015-09-031-6/+20
| |\| |
| | * | am 44c11d01: Merge "Stk: Icon related changes" into mnc-dr-devAmit Mahajan2015-09-031-6/+20
| | |\ \
| * | | | am e6bb02b8: am a7cdca22: Correct handling of Launch Browser command.Preeti Ahuja2015-09-021-20/+43
| |\| | |
| | * | | am a7cdca22: Correct handling of Launch Browser command.Preeti Ahuja2015-09-021-20/+43
| | |\ \ \
| * | | | | am a7429d23: (-s ours) am f67c3643: (-s ours) am cd4919b8: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| |\| | | |
| | * | | | am f67c3643: (-s ours) am cd4919b8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \
| * | | | | | am 1b1a1b6e: (-s ours) am 97fb0bba: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\| | | | |
| | * | | | | am 97fb0bba: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \
| * | | | | | | am cba2996a: UICC: Destroy input activity when the terminal responose is sent.hoonsung.park2015-07-101-0/+4
| |\| | | | | |
| * | | | | | | am 6ec76899: am 1a1e030c: (-s ours) am 50a02f3c: am e1f4e0bc: am 5b105d54: am...Amit Mahajan2015-07-020-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am f6fd0d1e: am 4d78f80d: am 735dff74: am c64048a2: am 904df6db: Merge commit...Amit Mahajan2015-06-270-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am c3f64efd: am 6d2e7c0f: (-s ours) am aa902abe: am f81c71d6: am 20499eea: DO...Amit Mahajan2015-06-260-0/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 0c707655: Change to add STK_PERMISSION for stk related commands.Amit Mahajan2015-06-111-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am bde7f03b: Remove user input from logcatCuihtlauac ALVARADO2015-06-022-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am ab064237: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | Automatic translation importMichael Bestas2016-03-05106-0/+1391
* | | | | | | | | | | | | | Automatic translation importMichael Bestas2016-02-022-0/+44
* | | | | | | | | | | | | | Launcher: Present STK app name if possibleRicardo Cerqueira2016-01-291-1/+6
* | | | | | | | | | | | | | Update layout to MaterialRicardo Cerqueira2016-01-291-6/+6
* | | | | | | | | | | | | | Automatic translation importMichael Bestas2016-01-251-1/+2
* | | | | | | | | | | | | | Automatic translation importMichael Bestas2016-01-113-0/+23
* | | | | | | | | | | | | | Automatic translation importMichael Bestas2015-12-2558-0/+1353
* | | | | | | | | | | | | | Stk: Move CAF stringsMichael Bestas2015-12-102-5/+24
* | | | | | | | | | | | | | Stk: EL AOSP translation modificationMichael Bestas2015-12-101-1/+1
* | | | | | | | | | | | | | Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/packages/...Steve Kondik2015-11-161-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | STK application should not show the STK menu for unsupported card.Yujing Gu2015-11-111-0/+5
* | | | | | | | | | | | | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-052-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-120-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-110-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | |
| * | | | / | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-182-3/+3
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Stk: Icon related changes" into mnc-dr-devAmit Mahajan2015-09-031-6/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Stk: Icon related changesPreeti Ahuja2015-09-031-6/+20
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * / | | | | | | | | | | | Correct handling of Launch Browser command.Preeti Ahuja2015-09-011-20/+43
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | am cd4919b8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-113-3/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'm' of git://codeaurora.org/platform/packages/apps/Stk into cm-13.0Steve Kondik2015-10-212-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge "Send the correct Message object for the Play Tone command."Linux Build Service Account2015-10-101-3/+4
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Send the correct Message object for the Play Tone command.Preeti Ahuja2015-10-061-3/+4
| * | | | | | | | | | | | Add content information to the stk menu item's icon.Preeti Ahuja2015-10-061-0/+2
| |/ / / / / / / / / / /
* / / / / / / / / / / / Stk: New launcher iconMichael Bestas2015-10-199-4/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Stk: Add support for Activate cmd and HCI connectivity eventPreeti Ahuja2015-10-064-1/+47
* | | | | | | | | | | STK: Add support for idle screen(home screen)Preeti Ahuja2015-10-063-3/+18
* | | | | | | | | | | Do not inform user when the alpha identifier is a null data.Umashankar Godachi2015-10-063-83/+167
* | | | | | | | | | | Handle UNSOL_STK_EVENT_NOTIFY command message properly.Preeti Ahuja2015-10-061-0/+4