Baligh Uddin
06de368067
am 56c597c1
: (-s ours) am bf65bf49
: (-s ours) Import translations. DO NOT MERGE
...
* commit '56c597c1b3c5a7d7d2f4e6e26c76c77b9e36120e':
Import translations. DO NOT MERGE
2013-08-22 10:59:01 -07:00
Baligh Uddin
56c597c1b3
am bf65bf49
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bf65bf49cba2addbcfef81dcea87b27593b9e083':
Import translations. DO NOT MERGE
2013-08-22 10:55:45 -07:00
Baligh Uddin
f3381a80bd
am f23da91e
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f23da91e52169b920fb21a10ff76d617117d5f95':
Import translations. DO NOT MERGE
2013-08-22 10:55:44 -07:00
Baligh Uddin
f23da91e52
Import translations. DO NOT MERGE
...
Change-Id: Iac08e7012b0da2da09077d0eaeda93b42473d14f
Auto-generated-cl: translation import
2013-08-21 16:04:35 -07:00
Baligh Uddin
bf65bf49cb
Import translations. DO NOT MERGE
...
Change-Id: Idc054aa50da72b31b8c75270bff2739ef541af01
Auto-generated-cl: translation import
2013-08-21 16:03:04 -07:00
Baligh Uddin
1df37ff1b1
am 2b851859
: (-s ours) am b09878b8
: (-s ours) Import translations. DO NOT MERGE
...
* commit '2b85185988eec44b6fdd3ee072d44b0a7a72d432':
Import translations. DO NOT MERGE
2013-08-19 13:04:58 -07:00
Baligh Uddin
2b85185988
am b09878b8
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b09878b85044df1032eb4612b3165216388165ac':
Import translations. DO NOT MERGE
2013-08-19 13:01:53 -07:00
Baligh Uddin
5c60179107
am 8485f115
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8485f115d25968c0fa3ab9d1ea42d2751422feb5':
Import translations. DO NOT MERGE
2013-08-19 13:00:37 -07:00
Baligh Uddin
21cbd017a3
am e37538b1
: (-s ours) am 8c6de9e0
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e37538b122199f316b8b8eb76a6445de6f5c83be':
Import translations. DO NOT MERGE
2013-08-19 13:00:36 -07:00
Baligh Uddin
8485f115d2
Import translations. DO NOT MERGE
...
Change-Id: Id76ef34b16fb0979b5b86c5e04b60e0d3088c54a
Auto-generated-cl: translation import
2013-08-19 12:04:34 -07:00
Baligh Uddin
b09878b850
Import translations. DO NOT MERGE
...
Change-Id: I3c136ce6349c35f3cec69d12f355daaf1e8912b5
Auto-generated-cl: translation import
2013-08-19 12:03:06 -07:00
Baligh Uddin
e37538b122
am 8c6de9e0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8c6de9e052810aeec7a347bd015e7e8bf2c337cc':
Import translations. DO NOT MERGE
2013-08-15 17:48:11 -07:00
Baligh Uddin
a7238c18b0
am dbf26e70
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'dbf26e70a1f546f9e198a72b2218ae99b015c9e6':
Import translations. DO NOT MERGE
2013-08-15 17:48:05 -07:00
Baligh Uddin
dbf26e70a1
Import translations. DO NOT MERGE
...
Change-Id: I9d761d078fd6bc6a07998e3e439242eab9ea0c14
Auto-generated-cl: translation import
2013-08-14 14:44:15 -07:00
Baligh Uddin
8c6de9e052
Import translations. DO NOT MERGE
...
Change-Id: Ia45a89a6f426413ccca221aba0d34e597cdb4ec7
Auto-generated-cl: translation import
2013-08-14 14:42:52 -07:00
Baligh Uddin
508997ad07
am 728da455
: (-s ours) am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '728da4558087e5b3fe25fad7eedb4f5de5c4068f':
Import translations. DO NOT MERGE
2013-08-13 00:45:32 -07:00
Baligh Uddin
728da45580
am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '03ae9bf0e90c02ec1afcd13c9993d2d9672eb36f':
Import translations. DO NOT MERGE
2013-08-13 00:42:15 -07:00
Baligh Uddin
08f1d439c7
am 05404105
: (-s ours) Import translations. DO NOT MERGE
...
* commit '054041058f9706c95b3d72ca421fcb656ad59d1e':
Import translations. DO NOT MERGE
2013-08-13 00:42:11 -07:00
Baligh Uddin
054041058f
Import translations. DO NOT MERGE
...
Change-Id: Ic75004da530d9dd114beb02d72928b2204f07b0e
Auto-generated-cl: translation import
2013-08-12 11:48:59 -07:00
Baligh Uddin
03ae9bf0e9
Import translations. DO NOT MERGE
...
Change-Id: I1f8effde31afbf4145ae6b234f0e02e08f9cb882
Auto-generated-cl: translation import
2013-08-12 11:47:40 -07:00
Baligh Uddin
7256942bb7
am d01ca3ce
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
...
* commit 'd01ca3ce4a5b93dc0dad46ad0674d6b28d89b0ee':
Import translations. DO NOT MERGE
2013-08-07 10:28:43 -07:00
Baligh Uddin
d01ca3ce4a
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
2013-08-07 17:24:07 +00:00
The Android Open Source Project
f4316f6d5b
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I84e2f72513f3087ff4628a838efcf471e3695934
2013-08-07 09:43:18 -07:00
Baligh Uddin
3bf09a9f84
Import translations. DO NOT MERGE
...
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
Conflicts:
res/values-nl/strings.xml
res/values-sw/strings.xml
2013-08-06 20:44:56 -07:00
Dianne Hackborn
703f8e9629
Fix issue #10190597 : "Any permission restrictions" is displayed after a...
...
...newline in "Reset app preferences" dialog
Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
2013-08-06 20:37:43 -07:00
Dianne Hackborn
2965215c6e
Reset app preferences now resets all app ops.
...
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
2013-08-06 20:37:33 -07:00
Baligh Uddin
d4c6b22188
Import translations. DO NOT MERGE
...
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
2013-08-06 20:10:13 -07:00
Dianne Hackborn
79f49fc878
Fix issue #10190597 : "Any permission restrictions" is displayed after a...
...
...newline in "Reset app preferences" dialog
Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
2013-08-06 20:10:05 -07:00
Baligh Uddin
b4d720f9d7
am 9a53339d
: (-s ours) am e211fd11
: (-s ours) Import translations. DO NOT MERGE
...
* commit '9a53339dd6ea5c683629a5fff8837e7e59581680':
Import translations. DO NOT MERGE
2013-08-06 20:05:46 -07:00
Baligh Uddin
9a53339dd6
am e211fd11
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e211fd11c65c7db4e0225c774519604efa98889c':
Import translations. DO NOT MERGE
2013-08-06 20:04:13 -07:00
Baligh Uddin
e211fd11c6
Import translations. DO NOT MERGE
...
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
2013-08-06 19:55:54 -07:00
Baligh Uddin
8c9f3fe405
Import translations. DO NOT MERGE
...
Change-Id: I271a9cdad27f7f5761cc16e14db5b512902d9b97
Auto-generated-cl: translation import
2013-08-05 21:43:40 -07:00
Dianne Hackborn
9a4f4656d7
am a5ac281d
: am 40557800
: Fix issue #10190597 : "Any permission restrictions" is displayed after a...
...
* commit 'a5ac281db7103aef790a6141cd72fdbc22835552':
Fix issue #10190597 : "Any permission restrictions" is displayed after a...
2013-08-05 16:49:02 -07:00
Dianne Hackborn
a5ac281db7
am 40557800
: Fix issue #10190597 : "Any permission restrictions" is displayed after a...
...
* commit '405578009471ab7908af26a813f7d2ef8c072a5c':
Fix issue #10190597 : "Any permission restrictions" is displayed after a...
2013-08-05 16:45:48 -07:00
Dianne Hackborn
4055780094
Fix issue #10190597 : "Any permission restrictions" is displayed after a...
...
...newline in "Reset app preferences" dialog
Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
2013-08-05 16:23:58 -07:00
Dianne Hackborn
fc222b8d3a
am 8f00b771
: Merge "Fix app ops details not displaying permissions under certain conditions."
...
* commit '8f00b7711c48a102a70f9b7e6a563aa14b79f5a5':
Fix app ops details not displaying permissions under certain conditions.
2013-08-05 11:15:43 -07:00
Dianne Hackborn
cc4b7eb15d
Reset app preferences now resets all app ops.
...
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
2013-08-05 11:12:51 -07:00
Dianne Hackborn
8f00b7711c
Merge "Fix app ops details not displaying permissions under certain conditions."
2013-08-05 18:11:11 +00:00
Danny Baumann
67e72d9e8a
Fix app ops details not displaying permissions under certain conditions.
...
If there's a permission that is not granted, the loop is aborted instead
of just skipping said permission.
Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb
2013-08-05 14:30:33 +02:00
Dianne Hackborn
ad38b60b37
am 0a09b13c
: am a6683e0f
: Reset app preferences now resets all app ops.
...
* commit '0a09b13c81bb0ebe556e46e3859a25805b2cbdcf':
Reset app preferences now resets all app ops.
2013-08-02 19:32:14 -07:00
Dianne Hackborn
0a09b13c81
am a6683e0f
: Reset app preferences now resets all app ops.
...
* commit 'a6683e0f4af75005ab5a1742d30df4bee071f725':
Reset app preferences now resets all app ops.
2013-08-02 19:30:09 -07:00
Dianne Hackborn
a6683e0f4a
Reset app preferences now resets all app ops.
...
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
2013-08-02 19:20:48 -07:00
Jean-Baptiste Queru
a43e270164
am 4dce3456
: am 034b83e8
: Reconcile with AOSP jb-mr2-dev - do not merge
...
* commit '4dce3456c7c858d5cec053cfd8a7f8ff2babec1d':
Completely remove app ops activity.
2013-08-02 17:44:48 -07:00
Jean-Baptiste Queru
4dce3456c7
am 034b83e8
: Reconcile with AOSP jb-mr2-dev - do not merge
...
* commit '034b83e8668a0b26d1eccfc9fa433b8eae3e50a8':
Completely remove app ops activity.
2013-08-02 17:39:03 -07:00
Jean-Baptiste Queru
034b83e866
Reconcile with AOSP jb-mr2-dev - do not merge
2013-08-02 14:48:27 -07:00
Dianne Hackborn
67c0500290
Completely remove app ops activity.
...
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
2013-08-02 14:45:05 -07:00
Dianne Hackborn
45d4dce29e
am ca1b7458
: Completely remove app ops activity.
...
* commit 'ca1b7458244191214172009d21eae2d04b6992f9':
Completely remove app ops activity.
2013-08-02 14:41:18 -07:00
Dianne Hackborn
ca1b745824
Completely remove app ops activity.
...
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
2013-08-02 14:35:10 -07:00
Dave Burke
ed71af9bd7
Revert "Completely remove app ops activity."
...
This reverts commit 1ad26e9c37
.
Change-Id: I58b5ea280ed0dbff00f7f6f98fbd41575cdd5222
2013-08-02 13:54:33 -07:00
Dave Burke
0b849a704b
am 1a32d477
: am 136059f1
: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
...
* commit '1a32d477934399ca5331863fe17651c1dbf165b8':
Revert "Completely remove app ops activity."
2013-08-02 13:42:04 -07:00