Commit Graph

7322 Commits

Author SHA1 Message Date
Ying Wang
dfc97385fe Import translations. DO NOT MERGE
Change-Id: If2979386d0d62cd5077ab1b4225b600d49a88fb2
Auto-generated-cl: translation import
2012-07-10 13:45:13 -07:00
Ying Wang
efc229b3c3 Import translations. DO NOT MERGE
Change-Id: Ifb1aa8aba94ef321761769d8253dab6b5326b59e
Auto-generated-cl: translation import
2012-07-10 13:42:00 -07:00
Ying Wang
8120ca85f6 am 5d950a82: (-s ours) am 051619c0: Import translations. DO NOT MERGE
* commit '5d950a8277261018047dda84966d9c2ec092520e':
  Import translations. DO NOT MERGE
2012-07-09 14:04:01 -07:00
Ying Wang
5d950a8277 am 051619c0: Import translations. DO NOT MERGE
* commit '051619c06338f776fd361c313b515c676fb74331':
  Import translations. DO NOT MERGE
2012-07-09 14:01:43 -07:00
Ying Wang
af0aaa1239 Import translations. DO NOT MERGE
Change-Id: Idf87c5d0c99bf4c9214b1d6a41ee19a9224b6f05
Auto-generated-cl: translation import
2012-07-09 13:23:39 -07:00
Ying Wang
051619c063 Import translations. DO NOT MERGE
Change-Id: I33c2d51c27d2942ddb00f11ad163406180fb1e17
Auto-generated-cl: translation import
2012-07-09 13:20:45 -07:00
Ying Wang
bff90a9755 am 51b2fef2: (-s ours) am 39aade5b: Import translations. DO NOT MERGE
* commit '51b2fef23587671007e38716db2a59ce60bf9e7f':
  Import translations. DO NOT MERGE
2012-07-03 14:58:36 -07:00
Ying Wang
51b2fef235 am 39aade5b: Import translations. DO NOT MERGE
* commit '39aade5b4e6b134bbd3962dc14efc4a9571bb8ab':
  Import translations. DO NOT MERGE
2012-07-03 14:56:07 -07:00
Ying Wang
1c9ce0dacd Merge "Import translations. DO NOT MERGE" 2012-07-03 14:51:45 -07:00
Ying Wang
574ebec978 Import translations. DO NOT MERGE
Change-Id: I47f714a1547115d65d08bda8a681f052ebc16d77
Auto-generated-cl: translation import
2012-07-03 13:44:53 -07:00
Ying Wang
39aade5b4e Import translations. DO NOT MERGE
Change-Id: I1634d69f5cdd74a0c33cc4796a1a17e89376a1e3
Auto-generated-cl: translation import
2012-07-03 13:41:30 -07:00
Irfan Sheriff
13cfaecc12 am 51cc655c: am 2fad853b: Merge "Limit length of SSID input string to 32"
* commit '51cc655ccdb8c78759095c709967a2185f2f61d8':
  Limit length of SSID input string to 32
2012-07-03 12:23:23 -07:00
Irfan Sheriff
5cf05f1081 am 7c8363eb: am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"
* commit '7c8363eb11b61f712e982b161a2267c2731df6fa':
  wifi: update text displayed during hotspot on/off
2012-07-03 12:23:21 -07:00
Irfan Sheriff
51cc655ccd am 2fad853b: Merge "Limit length of SSID input string to 32"
* commit '2fad853bf7282676ee3f2ec87630de5fdbcb236b':
  Limit length of SSID input string to 32
2012-07-03 12:18:35 -07:00
Irfan Sheriff
7c8363eb11 am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"
* commit 'd80ff0a4d615bd6f037483bf9dc2b10887d9507f':
  wifi: update text displayed during hotspot on/off
2012-07-03 12:18:33 -07:00
The Android Open Source Project
07b1f1637b am df833bea: Reconcile with jb-release
* commit 'df833bea374429922d6d7629a5ab498e3e10f8dd':
2012-07-03 12:17:14 -07:00
The Android Open Source Project
df833bea37 Reconcile with jb-release
Change-Id: I80999c1ca708772a1483e03093144b53b60e5c1e
2012-07-03 12:12:16 -07:00
Irfan Sheriff
2fad853bf7 Merge "Limit length of SSID input string to 32" 2012-07-03 11:35:44 -07:00
Irfan Sheriff
d80ff0a4d6 Merge "wifi: update text displayed during hotspot on/off" 2012-07-03 11:30:05 -07:00
The Android Automerger
e413019654 merge in jb-release history after reset to jb-dev 2012-07-02 16:21:14 -07:00
Eric Fischer
f91428832d Merge "Import translations. DO NOT MERGE" 2012-07-02 14:57:34 -07:00
Eric Fischer
952bdfad63 am 23513ea5: (-s ours) am a1146f83: Import translations. DO NOT MERGE
* commit '23513ea53e7d0813987471b56b434186e561b30a':
  Import translations. DO NOT MERGE
2012-07-02 14:40:15 -07:00
Eric Fischer
23513ea53e am a1146f83: Import translations. DO NOT MERGE
* commit 'a1146f83a985ce613145ae1e89b9e7311906a3b7':
  Import translations. DO NOT MERGE
2012-07-02 14:37:15 -07:00
Eric Fischer
76ecc313bb Import translations. DO NOT MERGE
Change-Id: Ie0a0c287cdf412aebf43d610b9e309cd32f68b16
Auto-generated-cl: translation import
2012-07-02 13:58:53 -07:00
Eric Fischer
a1146f83a9 Import translations. DO NOT MERGE
Change-Id: Ic3255b6b87db2a3b98fd3b41e4ab0ef24d67e292
Auto-generated-cl: translation import
2012-07-02 13:55:16 -07:00
The Android Automerger
2150577ad4 merge in jb-release history after reset to jb-dev 2012-07-02 12:57:04 -07:00
Ying Wang
4820298bf3 am d15183a9: (-s ours) am 9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'd15183a971590ca0e32bc78c8ed2a3470009fbae':
  Import translations. DO NOT MERGE
2012-06-29 18:02:44 -07:00
Ying Wang
d15183a971 am 9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '9ca616e42520ff12de921b8c301ef4cf7cb6c95a':
  Import translations. DO NOT MERGE
2012-06-29 17:59:04 -07:00
Ying Wang
2e943441c2 Merge "Import translations. DO NOT MERGE" 2012-06-29 17:55:02 -07:00
Ying Wang
9ca616e425 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-29 17:54:50 -07:00
Dianne Hackborn
3d3d4c891b am d601be8f: am 313ab172: Fix issue #6761130: Clearing app data in settings does not clear app\'s USB storage
* commit 'd601be8f945833ea95e6aaae769efb8ed26d964a':
  Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
2012-06-29 15:47:09 -07:00
Dianne Hackborn
d601be8f94 am 313ab172: Fix issue #6761130: Clearing app data in settings does not clear app\'s USB storage
* commit '313ab1727014d535790bc89afdcf725ff936e5b4':
  Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
2012-06-29 15:43:34 -07:00
Dianne Hackborn
313ab17270 Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
The installed app details was not correctly distinguishing between cache and
normal data on external storage.  The cache files on external storage are now
correctly shown in the cache section, since those are what get deleted when
you hit the clear cache button.

Change-Id: Id98bdb7fb5202d6a092fe5a772638eeb6aed2b47
2012-06-29 15:01:23 -07:00
Ying Wang
8d7cfd2140 Import translations. DO NOT MERGE
Change-Id: I16afd7e6e7465bbd23cb0d2076bc13a9edffcd59
Auto-generated-cl: translation import
2012-06-29 13:22:37 -07:00
Ying Wang
92b47c3690 Import translations. DO NOT MERGE
Change-Id: Ic81c64b7405a6de52473a90f61d58242779c8bf5
Auto-generated-cl: translation import
2012-06-29 13:19:19 -07:00
The Android Open Source Project
f6f81b3e89 am 4aa42e2e: Reconcile with jb-release
* commit '4aa42e2ea1789baea784e642e78db526b6ae24ab':
2012-06-29 08:19:33 -07:00
The Android Open Source Project
4aa42e2ea1 Reconcile with jb-release
Change-Id: Idef831103e3ee313ae771483241391f90f5feafb
2012-06-29 08:14:15 -07:00
The Android Automerger
f2dbd0fa9d merge in jb-release history after reset to jb-dev 2012-06-28 17:11:24 -07:00
Brian Muramatsu
0d03b7885e am 1f1b9abd: am beb3d8b1: Merge "Fix Settings NPE" into jb-dev
* commit '1f1b9abd0059bf7873e9a54288dc61d43ec39284':
  Fix Settings NPE
2012-06-28 16:59:01 -07:00
Brian Muramatsu
1f1b9abd00 am beb3d8b1: Merge "Fix Settings NPE" into jb-dev
* commit 'beb3d8b1e06f26c20adc4d4db7a08ac507ad6ab0':
  Fix Settings NPE
2012-06-28 16:56:29 -07:00
Brian Muramatsu
beb3d8b1e0 Merge "Fix Settings NPE" into jb-dev 2012-06-28 16:53:47 -07:00
Eric Fischer
159263f86c am c70bec44: (-s ours) am 3cc385b8: Import translations. DO NOT MERGE
* commit 'c70bec4454e612b3013c075a5eb6e77346fc298b':
  Import translations. DO NOT MERGE
2012-06-28 14:30:26 -07:00
Eric Fischer
c70bec4454 am 3cc385b8: Import translations. DO NOT MERGE
* commit '3cc385b83ca0f2c5e7a6b8464604ec3eb613f235':
  Import translations. DO NOT MERGE
2012-06-28 14:27:32 -07:00
Brian Muramatsu
c28af52e59 Fix Settings NPE
Labels for account types can be null which causes a NPE to occur in
Settings. If the label is null, don't bother adding an account
header. If we don't do this, then it would blow up when trying to
sort the headers anyway, so this change will fix the crash.

Bug 6727947

Change-Id: I284d7204b6d21c8d1b0a36e18ecae2c2361eeb84
2012-06-28 14:25:14 -07:00
Eric Fischer
56071f286b Import translations. DO NOT MERGE
Change-Id: Ib511e1cdf515c855ea235886b6c801a902136ba4
Auto-generated-cl: translation import
2012-06-28 12:54:07 -07:00
Eric Fischer
3cc385b83c Import translations. DO NOT MERGE
Change-Id: If4dd46dc84b974aabefe57aefb43de4329396c51
Auto-generated-cl: translation import
2012-06-28 12:51:19 -07:00
The Android Automerger
aa6707ae41 merge in jb-release history after reset to jb-dev 2012-06-28 07:04:34 -07:00
Ying Wang
1ad279c67f am ebf032df: (-s ours) am c812fe4c: Import translations. DO NOT MERGE
* commit 'ebf032dff98ad50163f2553f23a333f497041df3':
  Import translations. DO NOT MERGE
2012-06-27 17:24:33 -07:00
Ying Wang
ebf032dff9 am c812fe4c: Import translations. DO NOT MERGE
* commit 'c812fe4c0e989fcea906a6dda7c88a55076cd50d':
  Import translations. DO NOT MERGE
2012-06-27 17:21:34 -07:00
Ying Wang
1b92e714bb Import translations. DO NOT MERGE
Change-Id: I9a59e4f258f041a175e9fd05a60da9c21daabf40
2012-06-27 16:22:44 -07:00