OSDN Git Service
The Android Open Source Project [Tue, 7 Aug 2012 21:59:46 +0000 (14:59 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5
The Android Automerger [Tue, 7 Aug 2012 20:01:34 +0000 (13:01 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Fri, 3 Aug 2012 21:38:01 +0000 (14:38 -0700)]
am
3eee86b8: Import translations. DO NOT MERGE
* commit '
3eee86b8d7bc175e1e83269afc5c2c5441681a50':
Import translations. DO NOT MERGE
Ying Wang [Fri, 3 Aug 2012 20:41:54 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia673ddc20188c59c8591015e51033a526a7151ab
Auto-generated-cl: translation import
Michael Jurka [Fri, 3 Aug 2012 05:29:23 +0000 (22:29 -0700)]
am
ca511a81: Fix appwidget bind dialog
* commit '
ca511a8115962be7f598deb20aa47793db6d06f7':
Fix appwidget bind dialog
Michael Jurka [Fri, 3 Aug 2012 01:36:42 +0000 (18:36 -0700)]
Fix appwidget bind dialog
Bug:
6926529
Change-Id: I19327a6346b6e7da61a49a983b3373058db21f12
Ying Wang [Wed, 1 Aug 2012 22:28:32 +0000 (15:28 -0700)]
am
d7ae05db: Import translations. DO NOT MERGE
* commit '
d7ae05dbdc1af637e7e6655abb1a6b63e9d49968':
Import translations. DO NOT MERGE
Ying Wang [Wed, 1 Aug 2012 21:13:16 +0000 (14:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I581b48ef0f69e5bd2c469fd2ac61a8c5564bc553
Auto-generated-cl: translation import
The Android Open Source Project [Tue, 31 Jul 2012 21:48:53 +0000 (14:48 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: If5252c45f4163409ab8375e27cb13f3f06a237b6
The Android Automerger [Tue, 31 Jul 2012 21:07:44 +0000 (14:07 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Mon, 30 Jul 2012 22:06:58 +0000 (15:06 -0700)]
am
723bdf1e: Import translations. DO NOT MERGE
* commit '
723bdf1ec561d211b45f20546e6938e68feebf39':
Import translations. DO NOT MERGE
The Android Open Source Project [Mon, 30 Jul 2012 21:44:42 +0000 (14:44 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: I1e66be92b8c13756b702c251c8b8f93bc8b07a83
Ying Wang [Mon, 30 Jul 2012 20:25:03 +0000 (13:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6789871cb46bac62934f63182d2dacce3dda85e3
Auto-generated-cl: translation import
Ying Wang [Fri, 27 Jul 2012 22:46:02 +0000 (15:46 -0700)]
am
eaeb8b61: Import translations. DO NOT MERGE
* commit '
eaeb8b61d630e40dfe3851eb2a5f3300f3b30abe':
Import translations. DO NOT MERGE
Ying Wang [Fri, 27 Jul 2012 19:25:46 +0000 (12:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id5983c861a0f8d50f39517bae9271dba88c9e530
Auto-generated-cl: translation import
The Android Automerger [Fri, 27 Jul 2012 00:49:58 +0000 (17:49 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Amith Yamasani [Thu, 26 Jul 2012 23:07:19 +0000 (16:07 -0700)]
am
07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev
* commit '
078416689807e49c8b6750b9e3cc8a0e9ca3a2a1':
Move Google-apps specific location settings to a Google package
Ying Wang [Thu, 26 Jul 2012 23:07:17 +0000 (16:07 -0700)]
am
4e53a0cb: Import translations. DO NOT MERGE
* commit '
4e53a0cbdc56fce1a7fcf94c83d4a0f70ffd6920':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 26 Jul 2012 22:15:22 +0000 (15:15 -0700)]
Merge "Move Google-apps specific location settings to a Google package" into jb-dev
Ying Wang [Thu, 26 Jul 2012 22:11:52 +0000 (15:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I278308a46da25f82ee3da787b628cf67df4b6f0b
Auto-generated-cl: translation import
Amith Yamasani [Thu, 26 Jul 2012 01:28:51 +0000 (18:28 -0700)]
Move Google-apps specific location settings to a Google package
Bug:
6882764
This removes the Google specific checkbox and adds a master toggle
for location providers which turns both providers on/off when
toggled.
Change-Id: I2a7af0953902bfd6f4b221725dc2d838bb3d0ce4
Ying Wang [Wed, 25 Jul 2012 22:06:15 +0000 (15:06 -0700)]
am
c31f6b23: Import translations. DO NOT MERGE
* commit '
c31f6b23e400dc00fa69dddf575c33a06def0363':
Import translations. DO NOT MERGE
Ying Wang [Wed, 25 Jul 2012 21:17:08 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I56c497673b39fb29801bc6f4bb71ec205ddc4d10
Auto-generated-cl: translation import
Ying Wang [Wed, 25 Jul 2012 05:01:08 +0000 (22:01 -0700)]
am
54199540: Import translations. DO NOT MERGE
* commit '
54199540b1d07af1a71e10ab096493245ed5fdbd':
Import translations. DO NOT MERGE
The Android Automerger [Wed, 25 Jul 2012 03:23:17 +0000 (20:23 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 24 Jul 2012 19:39:36 +0000 (12:39 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Tue, 24 Jul 2012 19:38:57 +0000 (12:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaab1ba57ddc978edab0389c9172be39899d9bd24
Auto-generated-cl: translation import
Amith Yamasani [Tue, 24 Jul 2012 01:49:45 +0000 (18:49 -0700)]
am
4635ec6b: Strings for upcoming location settings changes.
* commit '
4635ec6b8dcf9a9f686a4d25eaffe916f5dcd20e':
Strings for upcoming location settings changes.
Amith Yamasani [Mon, 23 Jul 2012 23:40:02 +0000 (16:40 -0700)]
Strings for upcoming location settings changes.
Adding these first to parallelize translations.
Change-Id: Ia0fcecd6d714ad58c45e5ddc9ae5f00afce3e810
Ying Wang [Mon, 23 Jul 2012 21:03:33 +0000 (14:03 -0700)]
am
13be5469: Import translations. DO NOT MERGE
* commit '
13be54694f93172791bc342828594ede27919fc6':
Import translations. DO NOT MERGE
Ying Wang [Mon, 23 Jul 2012 20:05:38 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf81094651355da7433c69cefd2fddf0ccc0bc0a
Auto-generated-cl: translation import
Ying Wang [Fri, 20 Jul 2012 21:04:56 +0000 (14:04 -0700)]
am
509cfa1d: Import translations. DO NOT MERGE
* commit '
509cfa1d5422e4b4f892bf4a8612f9548a7665bd':
Import translations. DO NOT MERGE
Ying Wang [Fri, 20 Jul 2012 19:53:45 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic57f9912261e3b685eac931269bdac10353305d4
Auto-generated-cl: translation import
Ying Wang [Thu, 19 Jul 2012 21:51:30 +0000 (14:51 -0700)]
am
35e404c8: Import translations. DO NOT MERGE
* commit '
35e404c8f0236234cb75896f4d2b828bb60061aa':
Import translations. DO NOT MERGE
Ying Wang [Thu, 19 Jul 2012 21:21:34 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I029b2b28210dbac2b523152441195db55c352120
Auto-generated-cl: translation import
The Android Open Source Project [Thu, 19 Jul 2012 15:41:38 +0000 (08:41 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: If4a370c83e39eea43d31edcc1554ec1aeb539505
The Android Automerger [Thu, 19 Jul 2012 06:04:50 +0000 (23:04 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 19 Jul 2012 04:44:53 +0000 (21:44 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Thu, 19 Jul 2012 03:14:18 +0000 (20:14 -0700)]
am
2bc05a27: Import translations. DO NOT MERGE
* commit '
2bc05a2726935df5a085c78f8c7b0cfcc78aea43':
Import translations. DO NOT MERGE
Ying Wang [Wed, 18 Jul 2012 23:18:09 +0000 (16:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: If2837c8bd3b5aaf6aa089a0a7a711e1a5662fd7e
Auto-generated-cl: translation import
Ying Wang [Tue, 17 Jul 2012 20:41:39 +0000 (13:41 -0700)]
am
fa0f3fe1: Import translations. DO NOT MERGE
* commit '
fa0f3fe16225c57c91c9fe51981dc03f29938746':
Import translations. DO NOT MERGE
Ying Wang [Tue, 17 Jul 2012 19:54:32 +0000 (12:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia121cd0efbc34dbfbfcd96ad3befbeefd37de9ff
Auto-generated-cl: translation import
Wink Saville [Tue, 17 Jul 2012 19:36:41 +0000 (12:36 -0700)]
am
9ad4a898: (-s ours) Use telephony-common - DO NOT MERGE
* commit '
9ad4a89877363a6f1128b258f6535b29d2f778e2':
Use telephony-common - DO NOT MERGE
The Android Automerger [Tue, 17 Jul 2012 19:31:40 +0000 (12:31 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Wink Saville [Thu, 14 Jun 2012 19:33:43 +0000 (12:33 -0700)]
Use telephony-common - DO NOT MERGE
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
Ying Wang [Mon, 16 Jul 2012 21:25:53 +0000 (14:25 -0700)]
am
66daca6b: Import translations. DO NOT MERGE
* commit '
66daca6b24c166423438a1729b6a1e67d8def5b8':
Import translations. DO NOT MERGE
Ying Wang [Mon, 16 Jul 2012 19:57:58 +0000 (12:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief2131970749fdea0ec210f4d9ab309e671eb166
Auto-generated-cl: translation import
Dianne Hackborn [Sat, 14 Jul 2012 00:06:00 +0000 (17:06 -0700)]
am
ea819b07: Merge "Implement issue #
6819955: Add button to take bug report." into jb-dev
* commit '
ea819b07fa9e17fcd17e0384626ee6a47bc0ecd6':
Implement issue #
6819955: Add button to take bug report.
Dianne Hackborn [Sat, 14 Jul 2012 00:03:43 +0000 (17:03 -0700)]
Merge "Implement issue #
6819955: Add button to take bug report." into jb-dev
Dianne Hackborn [Fri, 13 Jul 2012 21:26:23 +0000 (14:26 -0700)]
Implement issue #
6819955: Add button to take bug report.
Change-Id: Ic615180121d4db52f92aa8264d95d790de5fff9d
John Wang [Thu, 30 Jun 2011 21:31:44 +0000 (14:31 -0700)]
Display FCC id for LTE in Settings.
If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.
bug:
4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
Ying Wang [Fri, 13 Jul 2012 20:51:57 +0000 (13:51 -0700)]
am
4b25c5ad: Import translations. DO NOT MERGE
* commit '
4b25c5ad8236feab94956d4626fe5c1409e5b989':
Import translations. DO NOT MERGE
Ying Wang [Fri, 13 Jul 2012 20:09:18 +0000 (13:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8959d6559f2a47b296216d6fb9817765e87588e5
Auto-generated-cl: translation import
Ying Wang [Thu, 12 Jul 2012 21:29:15 +0000 (14:29 -0700)]
am
62acae4f: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
62acae4f85c937e2f0a883a47b2819f122b84675':
Import translations. DO NOT MERGE
John Wang [Thu, 12 Jul 2012 21:29:13 +0000 (14:29 -0700)]
am
b0b45c02: Display FCC id for LTE in Settings.
* commit '
b0b45c02ec73c87f78a8358a7e98747bd96ec103':
Display FCC id for LTE in Settings.
Ying Wang [Thu, 12 Jul 2012 21:25:51 +0000 (14:25 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Thu, 12 Jul 2012 20:15:15 +0000 (13:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2c66f1ef1fbb1333fd1b6cea90839d2d0371006
Auto-generated-cl: translation import
The Android Automerger [Thu, 12 Jul 2012 06:13:32 +0000 (23:13 -0700)]
merge in jb-mr0-release history after reset to jb-dev
John Wang [Thu, 30 Jun 2011 21:31:44 +0000 (14:31 -0700)]
Display FCC id for LTE in Settings.
If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.
bug:
4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
Wink Saville [Thu, 14 Jun 2012 19:33:43 +0000 (12:33 -0700)]
Use telephony-common
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
Ying Wang [Tue, 10 Jul 2012 21:23:12 +0000 (14:23 -0700)]
am
efc229b3: Import translations. DO NOT MERGE
* commit '
efc229b3c3c969eef1d32d62435741228b96aeb9':
Import translations. DO NOT MERGE
Ying Wang [Tue, 10 Jul 2012 20:42:00 +0000 (13:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb1aa8aba94ef321761769d8253dab6b5326b59e
Auto-generated-cl: translation import
Ying Wang [Mon, 9 Jul 2012 21:01:43 +0000 (14:01 -0700)]
am
051619c0: Import translations. DO NOT MERGE
* commit '
051619c06338f776fd361c313b515c676fb74331':
Import translations. DO NOT MERGE
Ying Wang [Mon, 9 Jul 2012 20:20:45 +0000 (13:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33c2d51c27d2942ddb00f11ad163406180fb1e17
Auto-generated-cl: translation import
Ying Wang [Tue, 3 Jul 2012 21:56:07 +0000 (14:56 -0700)]
am
39aade5b: Import translations. DO NOT MERGE
* commit '
39aade5b4e6b134bbd3962dc14efc4a9571bb8ab':
Import translations. DO NOT MERGE
Ying Wang [Tue, 3 Jul 2012 20:41:30 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1634d69f5cdd74a0c33cc4796a1a17e89376a1e3
Auto-generated-cl: translation import
Irfan Sheriff [Tue, 3 Jul 2012 19:18:35 +0000 (12:18 -0700)]
am
2fad853b: Merge "Limit length of SSID input string to 32"
* commit '
2fad853bf7282676ee3f2ec87630de5fdbcb236b':
Limit length of SSID input string to 32
Irfan Sheriff [Tue, 3 Jul 2012 19:18:33 +0000 (12:18 -0700)]
am
d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"
* commit '
d80ff0a4d615bd6f037483bf9dc2b10887d9507f':
wifi: update text displayed during hotspot on/off
The Android Open Source Project [Tue, 3 Jul 2012 19:12:16 +0000 (12:12 -0700)]
Reconcile with jb-release
Change-Id: I80999c1ca708772a1483e03093144b53b60e5c1e
Irfan Sheriff [Tue, 3 Jul 2012 18:35:43 +0000 (11:35 -0700)]
Merge "Limit length of SSID input string to 32"
Irfan Sheriff [Tue, 3 Jul 2012 18:30:05 +0000 (11:30 -0700)]
Merge "wifi: update text displayed during hotspot on/off"
The Android Automerger [Mon, 2 Jul 2012 23:21:14 +0000 (16:21 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Mon, 2 Jul 2012 21:37:15 +0000 (14:37 -0700)]
am
a1146f83: Import translations. DO NOT MERGE
* commit '
a1146f83a985ce613145ae1e89b9e7311906a3b7':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 2 Jul 2012 20:55:16 +0000 (13:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic3255b6b87db2a3b98fd3b41e4ab0ef24d67e292
Auto-generated-cl: translation import
The Android Automerger [Mon, 2 Jul 2012 19:57:04 +0000 (12:57 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Sat, 30 Jun 2012 00:59:04 +0000 (17:59 -0700)]
am
9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
9ca616e42520ff12de921b8c301ef4cf7cb6c95a':
Import translations. DO NOT MERGE
Ying Wang [Sat, 30 Jun 2012 00:54:50 +0000 (17:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Dianne Hackborn [Fri, 29 Jun 2012 22:43:34 +0000 (15:43 -0700)]
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
Dianne Hackborn [Fri, 29 Jun 2012 22:01:23 +0000 (15:01 -0700)]
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
Ying Wang [Fri, 29 Jun 2012 20:19:19 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic81c64b7405a6de52473a90f61d58242779c8bf5
Auto-generated-cl: translation import
The Android Open Source Project [Fri, 29 Jun 2012 15:14:15 +0000 (08:14 -0700)]
Reconcile with jb-release
Change-Id: Idef831103e3ee313ae771483241391f90f5feafb
The Android Automerger [Fri, 29 Jun 2012 00:11:24 +0000 (17:11 -0700)]
merge in jb-release history after reset to jb-dev
Brian Muramatsu [Thu, 28 Jun 2012 23:56:29 +0000 (16:56 -0700)]
am
beb3d8b1: Merge "Fix Settings NPE" into jb-dev
* commit '
beb3d8b1e06f26c20adc4d4db7a08ac507ad6ab0':
Fix Settings NPE
Brian Muramatsu [Thu, 28 Jun 2012 23:53:47 +0000 (16:53 -0700)]
Merge "Fix Settings NPE" into jb-dev
Eric Fischer [Thu, 28 Jun 2012 21:27:32 +0000 (14:27 -0700)]
am
3cc385b8: Import translations. DO NOT MERGE
* commit '
3cc385b83ca0f2c5e7a6b8464604ec3eb613f235':
Import translations. DO NOT MERGE
Brian Muramatsu [Thu, 28 Jun 2012 21:25:14 +0000 (14:25 -0700)]
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
Eric Fischer [Thu, 28 Jun 2012 19:51:19 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4dd46dc84b974aabefe57aefb43de4329396c51
Auto-generated-cl: translation import
The Android Automerger [Thu, 28 Jun 2012 14:04:34 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Thu, 28 Jun 2012 00:21:34 +0000 (17:21 -0700)]
am
c812fe4c: Import translations. DO NOT MERGE
* commit '
c812fe4c0e989fcea906a6dda7c88a55076cd50d':
Import translations. DO NOT MERGE
Ying Wang [Wed, 27 Jun 2012 23:19:29 +0000 (16:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c769ea97c25696684c6818bfb84c95d30689b22
The Android Automerger [Tue, 26 Jun 2012 18:11:58 +0000 (11:11 -0700)]
merge in jb-release history after reset to jb-dev
Jake Hamby [Mon, 25 Jun 2012 23:21:18 +0000 (16:21 -0700)]
am
f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
* commit '
f59dd9d67e269a81c684ecd641e514aba8d2330a':
Add menu item to Settings to go to Cell Broadcast settings.
Jake Hamby [Mon, 25 Jun 2012 23:19:23 +0000 (16:19 -0700)]
Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
Eric Fischer [Mon, 25 Jun 2012 20:34:20 +0000 (13:34 -0700)]
am
40b78280: Import translations. DO NOT MERGE
* commit '
40b78280eb0c93d9ee3918813cfabf93a2919f35':
Import translations. DO NOT MERGE
Jake Hamby [Thu, 21 Jun 2012 17:59:22 +0000 (10:59 -0700)]
Add menu item to Settings to go to Cell Broadcast settings.
Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).
The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.
Bug:
6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62
Eric Fischer [Mon, 25 Jun 2012 20:00:04 +0000 (13:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic94e1bba24f847df6b65c46539bb2de12e8ab38b
The Android Open Source Project [Mon, 25 Jun 2012 14:57:38 +0000 (07:57 -0700)]
Reconcile with jb-release
Change-Id: Ib43ec64c9827ceb6956e4f86dcc9439e8a433e16
Ying Wang [Sat, 23 Jun 2012 12:36:47 +0000 (05:36 -0700)]
am
d7e8025f: Import translations. DO NOT MERGE
* commit '
d7e8025fdf91fd0a6dad9df6bc92e7cb9d7566c2':
Import translations. DO NOT MERGE
The Android Automerger [Sat, 23 Jun 2012 03:38:33 +0000 (20:38 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Fri, 22 Jun 2012 22:07:41 +0000 (15:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I417b1bbfd809569e110d5534fb2db1dd2c82075e