OSDN Git Service
The Android Open Source Project [Fri, 17 Aug 2012 01:57:02 +0000 (18:57 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Ie2c8260df9e0ee2206448b14f61be060206c22ba
The Android Automerger [Fri, 17 Aug 2012 00:57:52 +0000 (17:57 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Baligh Uddin [Wed, 15 Aug 2012 14:56:52 +0000 (07:56 -0700)]
am
11665038: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
1166503886e834f74953bfdb6f0ee54d6c834249':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 15 Aug 2012 14:54:44 +0000 (07:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Baligh Uddin [Wed, 15 Aug 2012 04:51:07 +0000 (21:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iec7b8dc92746f9c0449588e191cfa5920f112c19
Auto-generated-cl: translation import
Baligh Uddin [Tue, 14 Aug 2012 20:09:11 +0000 (13:09 -0700)]
am
cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
cb5624b80673e74f26d052f792dc8c9ce6e09a95':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 20:05:18 +0000 (13:05 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Baligh Uddin [Tue, 14 Aug 2012 19:55:11 +0000 (12:55 -0700)]
am
c5acc132: Import translations. DO NOT MERGE
* commit '
c5acc132ca3de71c36cca1ebea2635396172ab4a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 19:45:33 +0000 (12:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iba3c413c6b912f21e0529b16159abf4e4427b14b
Auto-generated-cl: translation import
Jean-Baptiste Queru [Tue, 14 Aug 2012 15:39:24 +0000 (08:39 -0700)]
am
5dbc1f64: Merge "Fix use of holo drawables in a few more places"
* commit '
5dbc1f6405c909d6b6ba2da03e5b5fe8b417d1ba':
Fix use of holo drawables in a few more places
Jean-Baptiste Queru [Tue, 14 Aug 2012 15:19:21 +0000 (08:19 -0700)]
Merge "Fix use of holo drawables in a few more places"
Björn Lundén [Mon, 13 Aug 2012 23:25:21 +0000 (01:25 +0200)]
Fix use of holo drawables in a few more places
Change-Id: Ie549ff14812da807729641fab1871fffe35f80b6
Jeff Sharkey [Mon, 13 Aug 2012 21:11:01 +0000 (14:11 -0700)]
am
42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
* commit '
42eb3fb2584b61aa27a4f89dd06817162f69fb3c':
Fix the issue the setting crashes after unmount SD card in landscape
Jeff Sharkey [Mon, 13 Aug 2012 21:11:00 +0000 (14:11 -0700)]
am
d7db6baa: Merge "Don\'t direct to market if no markets installed"
* commit '
d7db6baac7e7d6742916cf1f80e9cbf832b1c64d':
Don't direct to market if no markets installed
Baligh Uddin [Mon, 13 Aug 2012 20:24:26 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7921607b000389e13db13a4a6e0b0014ec1e87a1
Auto-generated-cl: translation import
Jeff Sharkey [Mon, 13 Aug 2012 20:17:12 +0000 (13:17 -0700)]
Merge "Fix the issue the setting crashes after unmount SD card in landscape"
Jeff Sharkey [Mon, 13 Aug 2012 20:14:08 +0000 (13:14 -0700)]
Merge "Don't direct to market if no markets installed"
Jean-Baptiste Queru [Mon, 13 Aug 2012 19:02:26 +0000 (12:02 -0700)]
am
eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit '
eefa61ed2e8583f659e868f3057f195d7cb2bb11':
Settings: Use ICS alert drawable
Jean-Baptiste Queru [Mon, 13 Aug 2012 18:53:45 +0000 (11:53 -0700)]
Merge "Settings: Use ICS alert drawable"
Chuanxiao Dong [Tue, 24 Jul 2012 05:09:24 +0000 (13:09 +0800)]
Fix the issue the setting crashes after unmount SD card in landscape
When rotate the phone, mLastClickedMountToggle and mClickedMountPoint
would be destroied which made dialog access NULL pointer.
Change-Id: Ic96fce93828ca7a6f8749fad6a258eb47831e062
Author: Chuanxiao Dong <chuanxiao.dong@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 26569
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:04:11 +0000 (14:04 -0700)]
am
5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '
5d72b2726797374e402943182d8132045ed32d3a':
Add support for SE Android to the Settings app.
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:19:26 +0000 (13:19 -0700)]
Merge "Add support for SE Android to the Settings app."
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
Xingrun Chen [Tue, 12 Jun 2012 06:15:39 +0000 (14:15 +0800)]
Don't direct to market if no markets installed
The search intent cannot be resolved if there aren't any
market apps installed, so it will cause Settings crashed by
the ActivityNotFound exception.
So we need to check if the market intent requst can be resolved.
Then determine to notify user to direct the accessibility services
to market to get TalkBack or not.
Change-Id: I0f0d7b54eb5215e1a886315bb6816704384f6c59
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
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
Stephen Smalley [Fri, 3 Feb 2012 16:14:48 +0000 (11:14 -0500)]
Add support for SE Android to the Settings app.
Display SELinux status (disabled, permissive, enforcing) under About phone.
Change-Id: I69529fb7a3adfe31eccb16d79740fc4952ff5e68
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
OSDN Git Service
