OSDN Git Service
Carlos Valdivia [Thu, 11 Sep 2014 17:12:11 +0000 (17:12 +0000)]
am
db591467: am
737d2d53: am
61ced6d4: am
01137c20: am
663b4e97: am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
db591467f6ae0e082c0ce627874a851f1926d63a':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 17:05:31 +0000 (17:05 +0000)]
am
737d2d53: am
61ced6d4: am
01137c20: am
663b4e97: am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
737d2d538b81ee843192d229ef558e69f2a944a9':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:59:49 +0000 (16:59 +0000)]
am
61ced6d4: am
01137c20: am
663b4e97: am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
61ced6d4270b86c336520856cb1545865cb01107':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:49:32 +0000 (16:49 +0000)]
am
01137c20: am
663b4e97: am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
01137c2004a617dae870f9c07b34a29f8706b615':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:42:54 +0000 (16:42 +0000)]
am
663b4e97: am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
663b4e9733e3c9dbfd2966f52edc2c7f7cff55c4':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:37:09 +0000 (16:37 +0000)]
am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
37b58a420ff59254cbe9420c64685fdb7ea4e375':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Mon, 8 Sep 2014 00:45:58 +0000 (17:45 -0700)]
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Unfortunately the Settings app has super powers. We shouldn't let
untrusted 3rd party authenticators re-purpose those powers to their own
nefarious ends. This means that we shouldn't pass along PendingIntents
that can have addressing information (component, action, category)
filled in by third parties.
Bug:
17356824
Change-Id: I397d26c5f465ddfb0e58bbc66cd44756e58cc507
(cherry picked from commit
f5d3e74ecc2b973941d8adbe40c6b23094b5abb7)
Baligh Uddin [Fri, 15 Aug 2014 22:36:02 +0000 (22:36 +0000)]
am
b3b64705: (-s ours) Import translations. DO NOT MERGE
* commit '
b3b647054e8610a29536ccee7be3aa2483e16431':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 21:21:56 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 21:34:21 +0000 (21:34 +0000)]
am
395cf2d1: (-s ours) am
12d64129: (-s ours) am
c53e033e: (-s ours) Import translations. DO NOT MERGE
* commit '
395cf2d1ce9ed817dae092b2fc33ad6f9bb881c4':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:27:40 +0000 (21:27 +0000)]
am
12d64129: (-s ours) am
c53e033e: (-s ours) Import translations. DO NOT MERGE
* commit '
12d6412978761f1aab14fbe9244d14c7cefc63b8':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:09 +0000 (21:21 +0000)]
am
c53e033e: (-s ours) Import translations. DO NOT MERGE
* commit '
c53e033e0a5f5f408a1818444462d4ea4e7f80f2':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:18:48 +0000 (21:18 +0000)]
am
5a55f567: (-s ours) Import translations. DO NOT MERGE
* commit '
5a55f567d9dcdb7a255cfcfeb86d9bb0add43ed6':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 12:00:45 +0000 (05:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib5aa49667b420a1ff6426274d9205242d638c78c
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 11:57:08 +0000 (04:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b2f01e63ccf0f291b96f749af7d85f2f0036728
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Jun 2014 16:54:22 +0000 (16:54 +0000)]
am
eab9192a: (-s ours) Import translations. DO NOT MERGE
* commit '
eab9192aca9091d2b72d6697220d192536b9201e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Jun 2014 17:39:48 +0000 (10:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b2d1434d76982612d7aa754464a4abf1210daef
Auto-generated-cl: translation import
Mark Salyzyn [Wed, 18 Jun 2014 14:20:11 +0000 (14:20 +0000)]
am
ce258caa: Merge changes I8f067f14,I54d8255a,Ib15917bf
* commit '
ce258caa4aa5cd1ea66b839ee7231c76fcfbc8d6':
Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE
Settings: logd: increase dialog title field size to 59
Settings: logd: increase summary field size to 30
Griff Hazen [Wed, 18 Jun 2014 09:00:55 +0000 (09:00 +0000)]
am
bd042089: DO NOT MERGE Fix build for notification listener internal api change
* commit '
bd042089891d749855be5d39d76380e7c7f85e6f':
DO NOT MERGE Fix build for notification listener internal api change
Griff Hazen [Wed, 18 Jun 2014 04:43:19 +0000 (21:43 -0700)]
DO NOT MERGE Fix build for notification listener internal api change
Bug:
15426276
Change-Id: I3861eb03796f9938f66237454aea148f5c64b370
Mark Salyzyn [Wed, 18 Jun 2014 14:12:52 +0000 (14:12 +0000)]
Merge changes I8f067f14,I54d8255a,Ib15917bf
* changes:
Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE
Settings: logd: increase dialog title field size to 59
Settings: logd: increase summary field size to 30
Fabrice Di Meglio [Tue, 17 Jun 2014 16:33:03 +0000 (09:33 -0700)]
Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE
- prevent NPE
- define default value (to 256K)
- add more logs for showing value which has been set or any exception
Bug:
15687210
Change-Id: I8f067f14d81ee56631d1ad74b91b5ede26cae125
Mark Salyzyn [Tue, 17 Jun 2014 16:56:30 +0000 (09:56 -0700)]
Settings: logd: increase dialog title field size to 59
Bug:
15660860
Change-Id: I54d8255a1fc28ff41e8d8adc693d2e66ff4cc311
Mark Salyzyn [Tue, 17 Jun 2014 16:48:51 +0000 (09:48 -0700)]
Settings: logd: increase summary field size to 30
Bug:
15661901
Bug:
15661903
Bug:
15644939
Bug:
15644940
Bug:
15662401
Bug:
15665444
Bug:
15668253
Change-Id: Ib15917bfdd4a1028d5d9d8ac4f7afe772a0ba77b
Mark Salyzyn [Fri, 13 Jun 2014 20:27:25 +0000 (20:27 +0000)]
am
5a9a18c1: Merge "logd: Add Developer settings for size"
* commit '
5a9a18c15b16be282ed48df0fa38045ae9016524':
logd: Add Developer settings for size
Mark Salyzyn [Fri, 13 Jun 2014 20:20:45 +0000 (20:20 +0000)]
Merge "logd: Add Developer settings for size"
Mark Salyzyn [Mon, 12 May 2014 17:19:09 +0000 (10:19 -0700)]
logd: Add Developer settings for size
- Dependent on some logd/init/selinux security changes.
Bug:
14563261
Change-Id: I11e3aa97a0ba40c3f55041d98c02d7e73629e984
Brian Carlstrom [Wed, 28 May 2014 23:13:26 +0000 (23:13 +0000)]
am
2ce0dcda: am
70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
2ce0dcdad47e132dbe0f9cd16146b8e3c6b11cd6':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:31:43 +0000 (22:31 +0000)]
am
70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
70f2201c7ab842df6c45a1540803239eafa267ed':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:47 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
3bc8aaad298c98eccff2060667b35fa1505f84e7)
Change-Id: I5c551d6d6f00af5a7b3638e3847950e441414e37
Baligh Uddin [Thu, 22 May 2014 03:15:46 +0000 (03:15 +0000)]
am
6a0bfc9f: (-s ours) Import translations. DO NOT MERGE
* commit '
6a0bfc9f2b8989b971b12738906804b8e1abbdb5':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 21 May 2014 21:52:35 +0000 (14:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idbb361c506a6d3d88653e6699b00d79c344b8c98
Auto-generated-cl: translation import
Jeff Sharkey [Fri, 9 May 2014 17:45:42 +0000 (17:45 +0000)]
am
14f42ca9: am
110ddbfe: Merge "Fix NullPointerException issue when user change"
* commit '
14f42ca9f46d2dafaadff2b0ccef645d66679bc7':
Fix NullPointerException issue when user change
Jeff Sharkey [Fri, 9 May 2014 17:41:27 +0000 (17:41 +0000)]
am
110ddbfe: Merge "Fix NullPointerException issue when user change"
* commit '
110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb':
Fix NullPointerException issue when user change
Jeff Sharkey [Fri, 9 May 2014 17:35:27 +0000 (17:35 +0000)]
Merge "Fix NullPointerException issue when user change"
Zhihai Xu [Wed, 30 Apr 2014 18:28:49 +0000 (18:28 +0000)]
am
d6b0b172: am
7dd84651: Merge "Display BTH connected status correctly"
* commit '
d6b0b1721a684be1805025908c4733a6b02794a4':
Display BTH connected status correctly
Zhihai Xu [Wed, 30 Apr 2014 18:25:22 +0000 (18:25 +0000)]
am
7dd84651: Merge "Display BTH connected status correctly"
* commit '
7dd84651a25566c5a2152d935f19a11cebfc58ae':
Display BTH connected status correctly
Zhihai Xu [Wed, 30 Apr 2014 18:22:48 +0000 (18:22 +0000)]
Merge "Display BTH connected status correctly"
Tsuyoshi Kamata [Wed, 18 Dec 2013 10:05:17 +0000 (19:05 +0900)]
Display BTH connected status correctly
This patch removes incorrect condition.
(to not use LocalBluetoothProfile#isPreferred())
This condition uses the priority that already disconnected profile,
so this codition always returns false.
To verify this issue:
1. Turn on Bluetooth.
2. Pair and connect to BTH(A2DP/HFP)
3. The display now says "Connected"
3. Disconnect HFP profile
4. The display still says "Connected" but it should say "Connected (no phone)"
Change-Id: I9e2bfa6d23bf1be7587c9556b4b05459d02c4817
Bill Yi [Wed, 30 Apr 2014 00:59:39 +0000 (00:59 +0000)]
Bill Yi [Tue, 29 Apr 2014 18:34:27 +0000 (11:34 -0700)]
Jun Su [Fri, 25 Apr 2014 06:18:29 +0000 (14:18 +0800)]
Fix NullPointerException issue when user change
When info is null, we have risk to have access null point.
Change-Id: Ie6acee5c99d6297e31d46585435a735a38b19e82
Elliott Hughes [Thu, 24 Apr 2014 23:59:10 +0000 (23:59 +0000)]
am
4c941850: Merge "Track MutableBoolean\'s new package."
* commit '
4c941850288011ca29466a1a80314155c0100fe3':
Track MutableBoolean's new package.
Elliott Hughes [Thu, 24 Apr 2014 23:52:13 +0000 (23:52 +0000)]
Merge "Track MutableBoolean's new package."
Elliott Hughes [Thu, 24 Apr 2014 01:04:40 +0000 (18:04 -0700)]
Track MutableBoolean's new package.
Change-Id: I96df3fcbc3b94186a36617dfc1df5b195880be13
Baligh Uddin [Wed, 23 Apr 2014 02:13:34 +0000 (02:13 +0000)]
am
06172af6: (-s ours) Import translations. DO NOT MERGE
* commit '
06172af69451678f5d1dd388a372ab00b58d682f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 00:59:15 +0000 (17:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9185da8de4b0c0818b926377543992356f265dd9
Auto-generated-cl: translation import
Christopher Tate [Tue, 22 Apr 2014 18:09:27 +0000 (18:09 +0000)]
am
442f01c6: am
95228074: am
c44d7c6b: Prohibit uninstall of the default (or only) home app
* commit '
442f01c6018f2fddb413a730b54d2eae542b1078':
Prohibit uninstall of the default (or only) home app
Christopher Tate [Tue, 22 Apr 2014 18:05:39 +0000 (18:05 +0000)]
am
95228074: am
c44d7c6b: Prohibit uninstall of the default (or only) home app
* commit '
95228074d2e01575799a526a29ec53a61c36aa23':
Prohibit uninstall of the default (or only) home app
Christopher Tate [Tue, 22 Apr 2014 17:58:59 +0000 (17:58 +0000)]
am
c44d7c6b: Prohibit uninstall of the default (or only) home app
* commit '
c44d7c6be64be790878ddf1f21c0d9e91d238245':
Prohibit uninstall of the default (or only) home app
Christopher Tate [Tue, 22 Apr 2014 17:17:21 +0000 (10:17 -0700)]
Prohibit uninstall of the default (or only) home app
We suppress the ability to uninstall (including uninstall of updates to
system-bundled apps) when the package in question is either the only
installed home app, or has been explicitly tagged by the user as the
"every time" home app among all those installed.
Bug
14162565
Change-Id: I582bb0d2abf0911ac68813f4c7e6fd7d17bfc2ca
Baligh Uddin [Thu, 17 Apr 2014 16:23:22 +0000 (16:23 +0000)]
am
54b5982f: (-s ours) Import translations. DO NOT MERGE
* commit '
54b5982f148290a00fa2ff38e7e30d487cf69998':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 00:18:12 +0000 (17:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I20c3ae14070c3fae914ec7151dc425ddf518ffa6
Auto-generated-cl: translation import
Wink Saville [Wed, 16 Apr 2014 20:26:53 +0000 (20:26 +0000)]
am
242184ca: Merge "Allow tablets to send SMS if enabled in device overlays (1/2)"
* commit '
242184ca23b8ef70f5347874ac9b5c59cce36208':
Allow tablets to send SMS if enabled in device overlays (1/2)
Wink Saville [Wed, 16 Apr 2014 20:21:57 +0000 (20:21 +0000)]
Merge "Allow tablets to send SMS if enabled in device overlays (1/2)"
Baligh Uddin [Wed, 16 Apr 2014 15:43:33 +0000 (15:43 +0000)]
am
81ff7980: (-s ours) Import translations. DO NOT MERGE
* commit '
81ff798050d4223dec7038cc466847e0d2ef999b':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Apr 2014 19:41:44 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I571889dbba0de412f258289e097ec510fbf02e05
Auto-generated-cl: translation import
Baligh Uddin [Thu, 10 Apr 2014 16:06:37 +0000 (16:06 +0000)]
am
b6b3172c: (-s ours) am
915ef6e3: (-s ours) am
52e3681f: (-s ours) Import translations. DO NOT MERGE
* commit '
b6b3172c35646a6292ae312fb23795afafb4c96b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 16:03:05 +0000 (16:03 +0000)]
am
2632b25f: (-s ours) am
fba8cd35: (-s ours) Import translations. DO NOT MERGE
* commit '
2632b25fae55411ff4974d510d599af75d35045a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 16:02:35 +0000 (16:02 +0000)]
am
915ef6e3: (-s ours) am
52e3681f: (-s ours) Import translations. DO NOT MERGE
* commit '
915ef6e3127b34c73d43e86149b9aabc23216e72':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 16:00:02 +0000 (16:00 +0000)]
am
52e3681f: (-s ours) Import translations. DO NOT MERGE
* commit '
52e3681feb64afaefd5cffa5a9e88a97bca4d48d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:59:28 +0000 (15:59 +0000)]
am
8bec9dba: (-s ours) Import translations. DO NOT MERGE
* commit '
8bec9dba479ba901c913f59c7585369af1bf639d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:57:44 +0000 (15:57 +0000)]
am
fba8cd35: (-s ours) Import translations. DO NOT MERGE
* commit '
fba8cd35b71853118508eab15a3cbef96a539dec':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 9 Apr 2014 19:46:43 +0000 (12:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iff7d2cccff323a2cfb7193d399e8910f226304d7
Auto-generated-cl: translation import
Baligh Uddin [Wed, 9 Apr 2014 19:43:07 +0000 (12:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8cec72991260fa660991ca7423299bbf417df000
Auto-generated-cl: translation import
Baligh Uddin [Wed, 9 Apr 2014 19:41:44 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I84d923dacf746299500503257fd925228b869e82
Auto-generated-cl: translation import
Baligh Uddin [Tue, 8 Apr 2014 02:39:05 +0000 (02:39 +0000)]
am
ffa6f523: (-s ours) am
f56d838a: (-s ours) am
2319553c: (-s ours) Import translations. DO NOT MERGE
* commit '
ffa6f52358f0f732d83decbfa6be558207969654':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:31:59 +0000 (02:31 +0000)]
am
f56d838a: (-s ours) am
2319553c: (-s ours) Import translations. DO NOT MERGE
* commit '
f56d838afe7f813fb2ed761d3ebeb79b79d910a0':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:31:50 +0000 (02:31 +0000)]
am
b282957b: (-s ours) am
0f2228a5: (-s ours) Import translations. DO NOT MERGE
* commit '
b282957b48df3ede7a0628e2ef6a2ad5dbe73179':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:46 +0000 (02:24 +0000)]
am
0f2228a5: (-s ours) Import translations. DO NOT MERGE
* commit '
0f2228a5480759551b1faf93d510fc9c1c16ea06':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:35 +0000 (02:24 +0000)]
am
2319553c: (-s ours) Import translations. DO NOT MERGE
* commit '
2319553cdc644c4fae21ca3ad55564729f409cf4':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:35 +0000 (02:24 +0000)]
am
b9abc323: (-s ours) Import translations. DO NOT MERGE
* commit '
b9abc323b95650e30589c957062fec790436ec0d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 7 Apr 2014 19:10:30 +0000 (12:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9c4dadd6e7a78db976f67c0c494b06495a69e45b
Auto-generated-cl: translation import
Baligh Uddin [Mon, 7 Apr 2014 19:07:10 +0000 (12:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4c9953f71809e215404a0e150abbba7bb098504a
Auto-generated-cl: translation import
Baligh Uddin [Mon, 7 Apr 2014 19:05:35 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I933f503cae1b0ae72af3c9f3513ff86355d8e095
Auto-generated-cl: translation import
Xia Wang [Sat, 5 Apr 2014 00:51:44 +0000 (00:51 +0000)]
am
d2f56f07: am
ac768973: am
ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '
d2f56f07f97e72e62c51b82454d06de1e7b929a8':
Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Sat, 5 Apr 2014 00:48:38 +0000 (00:48 +0000)]
am
ac768973: am
ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '
ac768973bc23b9f8f266013c20d301554729fd70':
Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Sat, 5 Apr 2014 00:43:17 +0000 (00:43 +0000)]
am
ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '
ce11881accf5db04e2a54b58176e24de49ef6917':
Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Fri, 4 Apr 2014 23:23:38 +0000 (16:23 -0700)]
Allow VPN to stay connected for some time before disconnecting it.
Change-Id: I25994b8329514a32b5b6f383abef231d3decb4ec
Baligh Uddin [Fri, 4 Apr 2014 14:53:11 +0000 (14:53 +0000)]
am
87132265: (-s ours) am
3f3469ae: (-s ours) am
cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
871322653c4109a9640b56374a246120c65f8241':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:45:54 +0000 (14:45 +0000)]
am
44e3e56f: (-s ours) am
216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
44e3e56fe20c2fc59d90b6ef6564458cffb1efa7':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:45:45 +0000 (14:45 +0000)]
am
3f3469ae: (-s ours) am
cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
3f3469aecc1da8bf72482ddae53e11d0245fddd9':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:38:19 +0000 (14:38 +0000)]
am
216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
216b5c501bb81977407b5977e6ee709b34f3a37d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:37:50 +0000 (14:37 +0000)]
am
cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
cc01536f7755da6560a23057ac3dbdec10e3993f':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:37:19 +0000 (14:37 +0000)]
am
457681d5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
457681d5f15aaa32edf76e0765d1e9e2b532893e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:32:06 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 4 Apr 2014 14:32:04 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 4 Apr 2014 14:31:59 +0000 (14:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Adrian Roos [Thu, 3 Apr 2014 14:57:22 +0000 (14:57 +0000)]
am
79a17924: am
0b55caf0: am
a52a37b0: am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
79a179244612b09368209e2c95e48fe836aeab59':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:51:39 +0000 (14:51 +0000)]
am
0b55caf0: am
a52a37b0: am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
0b55caf01af1efa15ff0bfbf50a1726fce788660':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:45:34 +0000 (14:45 +0000)]
am
a52a37b0: am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
a52a37b0fe17109877abbc25943d0d74232f3e5f':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:38:30 +0000 (14:38 +0000)]
am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
1b0b38cfeb54638899ddab48ff9198590f951a55':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:35:13 +0000 (14:35 +0000)]
am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
5d3c8c89fca09ee190fe8df37e76ff05cc3833b1':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:29:57 +0000 (14:29 +0000)]
am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
90630f6a6d19e169befb8ad8117d53200eb562c4':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:23:57 +0000 (14:23 +0000)]
am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
09235d1065b501aa8a42e0767d72c15e7b846bae':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:17:11 +0000 (14:17 +0000)]
am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
82b3e62a4f8c8a229f700bbf122b8f8854162146':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:11:02 +0000 (14:11 +0000)]
am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
4692a48c28d7002221fec28d5ac324636f81c8f2':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:05:07 +0000 (14:05 +0000)]
am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
c4bfea207acf62c9e70949d3225d082d95d4d193':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:58:57 +0000 (13:58 +0000)]
am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
3f38173fadc1423d4c36b265a2ab5fdc09d88271':
Add lockout after trying to enter PIN / Password too often
OSDN Git Service
