OSDN Git Service
Ravi Nagarajan [Wed, 1 Aug 2012 07:44:12 +0000 (00:44 -0700)]
am
c70f5483: Reset the priority on unbond
* commit '
c70f5483553f5ff2bddc289ea8b7741bc81c9fbf':
Reset the priority on unbond
Swaminatha Balaji [Wed, 1 Aug 2012 07:44:09 +0000 (00:44 -0700)]
am
b45e3c8f: Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
* commit '
b45e3c8fe9c08851800a6afa362d975944c0cd46':
Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
Ganesh Ganapathi Batta [Wed, 1 Aug 2012 07:44:07 +0000 (00:44 -0700)]
am
802956ec: Add dev to cached dev list if entry is missing before auto connect
* commit '
802956ec9b22464ed327c0c2cbc59f6b6a309c88':
Add dev to cached dev list if entry is missing before auto connect
Ravi Nagarajan [Fri, 29 Jun 2012 13:54:16 +0000 (19:24 +0530)]
Reset the priority on unbond
Change-Id: I67b68bd70b947177218e0b908b79ebb9de9f45a8
Swaminatha Balaji [Mon, 25 Jun 2012 11:04:41 +0000 (04:04 -0700)]
Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
Change-Id: I0716782a5308cc45297a30d0a7371286c75bfa52
Ganesh Ganapathi Batta [Thu, 14 Jun 2012 07:05:06 +0000 (00:05 -0700)]
Add dev to cached dev list if entry is missing before auto connect
Fix for BLTH01482218
Change-Id: I7d5cfad3eff872b5eb0b0c71804f25f3c3334557
The Android Open Source Project [Tue, 31 Jul 2012 22:04:02 +0000 (15:04 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Icc9358e5fffbcb4af923a9f66b59b15d6113fade
The Android Open Source Project [Tue, 31 Jul 2012 21:52:52 +0000 (14:52 -0700)]
am
dbe1a24d: am
f6162c80: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
dbe1a24d3595bff9b911b46f34e12a18e55cab74':
The Android Open Source Project [Tue, 31 Jul 2012 21:51:08 +0000 (14:51 -0700)]
am
f6162c80: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
f6162c80cf048fe710f5cc0502fcfc052ff98385':
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
The Android Automerger [Tue, 31 Jul 2012 14:35:31 +0000 (07:35 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Mon, 30 Jul 2012 22:12:24 +0000 (15:12 -0700)]
am
e2d5699d: am
9691c1e6: (-s ours) am
723bdf1e: Import translations. DO NOT MERGE
* commit '
e2d5699d2592fb03c03c0d74ee414dcff31bbf90':
Import translations. DO NOT MERGE
Ying Wang [Mon, 30 Jul 2012 22:10:37 +0000 (15:10 -0700)]
am
df61ddc9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
df61ddc964eb626e5952cc3918d9b227fcc6e7b7':
Import translations. DO NOT MERGE
Ying Wang [Mon, 30 Jul 2012 22:09:41 +0000 (15:09 -0700)]
am
9691c1e6: (-s ours) am
723bdf1e: Import translations. DO NOT MERGE
* commit '
9691c1e646b143690476724b1d7f8dc788cfe00f':
Import translations. DO NOT MERGE
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 22:05:14 +0000 (15:05 -0700)]
Reconcile with jb-mr1-release
Change-Id: I748fdd61c5644211f2406b42eefa521e4d7ed2d7
Ying Wang [Mon, 30 Jul 2012 22:04:58 +0000 (15:04 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Open Source Project [Mon, 30 Jul 2012 21:47:35 +0000 (14:47 -0700)]
am
c9976592: am
a62d7893: Reconcile with jb-mr0-release jb-release
* commit '
c99765925dfa0e2e08861a71ea1c7d103e6080d0':
The Android Open Source Project [Mon, 30 Jul 2012 21:46:08 +0000 (14:46 -0700)]
am
a62d7893: Reconcile with jb-mr0-release jb-release
* commit '
a62d7893891d044248553762cd34fe89dd2c7cd6':
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 21:26:06 +0000 (14:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia75c76064c1726e4453a5ce54bcfa137fe52f7de
Auto-generated-cl: translation import
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
The Android Automerger [Mon, 30 Jul 2012 16:46:10 +0000 (09:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Irfan Sheriff [Mon, 30 Jul 2012 05:37:13 +0000 (22:37 -0700)]
am
e93bc70c: am
dd4dd50f: Merge "Fix DNS hint in settings" into jb-mr1-dev
* commit '
e93bc70c00a9f916e7dce7c706eba9e91caee3c3':
Fix DNS hint in settings
Irfan Sheriff [Mon, 30 Jul 2012 05:33:37 +0000 (22:33 -0700)]
am
dd4dd50f: Merge "Fix DNS hint in settings" into jb-mr1-dev
* commit '
dd4dd50fe195d1642b67918e0e5ec83be9ee354d':
Fix DNS hint in settings
Irfan Sheriff [Mon, 30 Jul 2012 05:30:46 +0000 (22:30 -0700)]
Merge "Fix DNS hint in settings" into jb-mr1-dev
Irfan Sheriff [Mon, 30 Jul 2012 02:18:03 +0000 (19:18 -0700)]
Fix DNS hint in settings
Change-Id: I382dbd60c2956a53a77547744790c33e93ce8404
Ying Wang [Fri, 27 Jul 2012 23:24:37 +0000 (16:24 -0700)]
am
aecf1901: (-s ours) am
fdc600a4: am
270a5503: (-s ours) am
eaeb8b61: Import translations. DO NOT MERGE
* commit '
aecf1901d05e579cbbcde4111e6301ae84ff947d':
Import translations. DO NOT MERGE
Ying Wang [Fri, 27 Jul 2012 22:55:43 +0000 (15:55 -0700)]
am
fdc600a4: am
270a5503: (-s ours) am
eaeb8b61: Import translations. DO NOT MERGE
* commit '
fdc600a45be9c3ad5ae4e46fd75c76c38d39ccd9':
Import translations. DO NOT MERGE
Ying Wang [Fri, 27 Jul 2012 22:51:10 +0000 (15:51 -0700)]
am
270a5503: (-s ours) am
eaeb8b61: Import translations. DO NOT MERGE
* commit '
270a55034107d16dc993b61871314a306cb03439':
Import translations. DO NOT MERGE
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:30:02 +0000 (12:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia228d05c3fb39b5b7df90a0ac515fa7ed1d7417e
Auto-generated-cl: translation import
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:18:35 +0000 (16:18 -0700)]
am
ff1e3f31: am
09f2f5af: am
2d018a8b: am
07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev
* commit '
ff1e3f3111f8fc3256e3abe5ab96522b90e6c099':
Move Google-apps specific location settings to a Google package
Ying Wang [Thu, 26 Jul 2012 23:18:34 +0000 (16:18 -0700)]
am
98024d99: (-s ours) am
a7bb6922: am
afc96c1b: (-s ours) am
4e53a0cb: Import translations. DO NOT MERGE
* commit '
98024d99fcb774094d8fab44c89e19ff526f7548':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 26 Jul 2012 23:15:23 +0000 (16:15 -0700)]
am
09f2f5af: am
2d018a8b: am
07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev
* commit '
09f2f5afc1f6e3795dd9d361023e908bfabd6f2f':
Move Google-apps specific location settings to a Google package
Ying Wang [Thu, 26 Jul 2012 23:15:22 +0000 (16:15 -0700)]
am
a7bb6922: am
afc96c1b: (-s ours) am
4e53a0cb: Import translations. DO NOT MERGE
* commit '
a7bb69228dba715f6b9c7d60599aff2bdb38df4b':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 26 Jul 2012 23:12:51 +0000 (16:12 -0700)]
am
2d018a8b: am
07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev
* commit '
2d018a8b0d2f0a7e7c3ee9ea2d9ba7df3a161604':
Move Google-apps specific location settings to a Google package
Ying Wang [Thu, 26 Jul 2012 23:12:50 +0000 (16:12 -0700)]
am
afc96c1b: (-s ours) am
4e53a0cb: Import translations. DO NOT MERGE
* commit '
afc96c1b8798d90477b1725b28f565a484a1d592':
Import translations. DO NOT MERGE
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:15:23 +0000 (15:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f571329c5f6ae9a21e81055db84293cab341db0
Auto-generated-cl: translation import
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 [Thu, 26 Jul 2012 15:15:18 +0000 (08:15 -0700)]
am
a8c28134: (-s ours) am
f35b013b: am
7717e194: (-s ours) am
7021c6e6: (-s ours) am
c31f6b23: Import translations. DO NOT MERGE
* commit '
a8c281347d453b9abba10d91a86ee8d8c6725690':
Ying Wang [Thu, 26 Jul 2012 15:15:17 +0000 (08:15 -0700)]
am
b1fcdd60: (-s ours) am
36166474: Merge "Import translations. DO NOT MERGE"
* commit '
b1fcdd606d63fa43dc6a0aeeca13e3784cfcbb6f':
Wink Saville [Thu, 26 Jul 2012 15:15:13 +0000 (08:15 -0700)]
am
1647b853: am
eca0eee0: Merge "Test getAllCellInfo and onCellInfoChanged."
* commit '
1647b853a81d43a1362c00b48b292d7249c411ba':
Irfan Sheriff [Thu, 26 Jul 2012 15:15:12 +0000 (08:15 -0700)]
am
ab0e52b0: am
0cd75608: Merge "Use updated WifiManager API"
* commit '
ab0e52b08b43d382688fabdf0216b6a7a7a4e5ce':
Ying Wang [Thu, 26 Jul 2012 15:08:49 +0000 (08:08 -0700)]
am
f35b013b: am
7717e194: (-s ours) am
7021c6e6: (-s ours) am
c31f6b23: Import translations. DO NOT MERGE
* commit '
f35b013beb67159301a6c666093a099e655e66f0':
Ying Wang [Thu, 26 Jul 2012 15:08:47 +0000 (08:08 -0700)]
am
36166474: Merge "Import translations. DO NOT MERGE"
* commit '
36166474885c4440423d4d3e6c2d9be0bc04ff0c':
Import translations. DO NOT MERGE
Wink Saville [Thu, 26 Jul 2012 15:08:46 +0000 (08:08 -0700)]
am
eca0eee0: Merge "Test getAllCellInfo and onCellInfoChanged."
* commit '
eca0eee041b866691bb5582665e5519903520aeb':
Test getAllCellInfo and onCellInfoChanged.
Irfan Sheriff [Thu, 26 Jul 2012 15:08:44 +0000 (08:08 -0700)]
am
0cd75608: Merge "Use updated WifiManager API"
* commit '
0cd75608c0dc6f4a33e8ff944478945083430394':
Use updated WifiManager API
Ying Wang [Thu, 26 Jul 2012 06:05:21 +0000 (23:05 -0700)]
am
7717e194: (-s ours) am
7021c6e6: (-s ours) am
c31f6b23: Import translations. DO NOT MERGE
* commit '
7717e194ce281a57c72628c5fcb51d9365fb5c7f':
Import translations. DO NOT MERGE
Ying Wang [Wed, 25 Jul 2012 22:09:39 +0000 (15:09 -0700)]
am
7021c6e6: (-s ours) am
c31f6b23: Import translations. DO NOT MERGE
* commit '
7021c6e6df25fc2d100d8351be0eab1605c1693d':
Import translations. DO NOT MERGE
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 22:04:20 +0000 (15:04 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Wed, 25 Jul 2012 21:20:30 +0000 (14:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I71914c5d78b072ce9ed4aeeaf4c07c0eb05f7967
Auto-generated-cl: translation import
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
Wink Saville [Wed, 25 Jul 2012 21:11:58 +0000 (14:11 -0700)]
Merge "Test getAllCellInfo and onCellInfoChanged."
Irfan Sheriff [Wed, 25 Jul 2012 19:25:42 +0000 (12:25 -0700)]
Merge "Use updated WifiManager API"
Fabrice Di Meglio [Wed, 25 Jul 2012 18:26:41 +0000 (11:26 -0700)]
Merge "Make Settings PercentageBar RTL aware"
Fabrice Di Meglio [Wed, 25 Jul 2012 18:21:45 +0000 (11:21 -0700)]
Merge "Make Settings app aware of layout direction"
Irfan Sheriff [Tue, 10 Jul 2012 18:42:55 +0000 (11:42 -0700)]
Use updated WifiManager API
Change-Id: Ia02fc8a7eafa84fa4eddeeefafa7fecaac82903e
Ying Wang [Wed, 25 Jul 2012 05:05:54 +0000 (22:05 -0700)]
am
5bc4bb20: (-s ours) am
54199540: Import translations. DO NOT MERGE
* commit '
5bc4bb204a3b7c10c62f06c91b65bd8091b153f7':
Import translations. DO NOT MERGE
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
Fabrice Di Meglio [Wed, 25 Jul 2012 00:31:22 +0000 (17:31 -0700)]
Make Settings PercentageBar RTL aware
- see bug #
5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)
Change-Id: I7c4c4207650fa4442f6eb20f2195101e23b1b0b2
Fabrice Di Meglio [Fri, 20 Jul 2012 02:25:50 +0000 (19:25 -0700)]
Make Settings app aware of layout direction
- see bug #
5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)
Change-Id: I696c0f66a16640af767da3c05b5d300fd2284ecb
Ying Wang [Tue, 24 Jul 2012 19:42:50 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I06f071866f2a8ae36122d99784f682c1f6a2748c
Auto-generated-cl: translation import
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 02:53:33 +0000 (19:53 -0700)]
am
bebcc976: am
4635ec6b: Strings for upcoming location settings changes.
* commit '
bebcc976853285a668fd2ff5d36561183d0c34f9':
Strings for upcoming location settings changes.
Ying Wang [Tue, 24 Jul 2012 02:52:31 +0000 (19:52 -0700)]
am
e3627120: (-s ours) am
13be5469: Import translations. DO NOT MERGE
* commit '
e3627120c37ae409d474e59d878ea46b10c4876e':
Import translations. DO NOT MERGE
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:11:29 +0000 (13:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I303b2963d0096be4ba94f7217481bc3e8076c646
Auto-generated-cl: translation import
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 [Sat, 21 Jul 2012 05:35:12 +0000 (22:35 -0700)]
am
b6021933: (-s ours) am
509cfa1d: Import translations. DO NOT MERGE
* commit '
b602193318013c1ba6c4e5f92404c7a0ae39394a':
Import translations. DO NOT MERGE
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:57:12 +0000 (12:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I964869154c2b70562aee7a90b6e2404dc405f1be
Auto-generated-cl: translation import
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 [Fri, 20 Jul 2012 17:00:24 +0000 (10:00 -0700)]
am
fc8267ab: (-s ours) am
35e404c8: Import translations. DO NOT MERGE
* commit '
fc8267abd541d19460b89d7eb875fdec35a32200':
Import translations. DO NOT MERGE
Narayan Kamath [Fri, 20 Jul 2012 12:27:12 +0000 (13:27 +0100)]
Fix some long forgottten TTS settings bugs
- Handle radio button clicks correctly
- Handle injecting voice data correctly
bug:
5998256
bug:
5938852
bug:
5998418
Change-Id: Ib30afa6558e51ac9a88e28c51500ebaad93ad7fe
Jeff Sharkey [Fri, 20 Jul 2012 00:09:52 +0000 (17:09 -0700)]
Migrate VpnProfile definition to framework.
Bug:
5756357
Change-Id: Icf4b2cb10e911216a2165f2afd1eb89152c5f1c0
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:49:25 +0000 (14:49 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Thu, 19 Jul 2012 21:25:23 +0000 (14:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5e18288959114e14da70f4a5a9f212c61e5180e2
Auto-generated-cl: translation import
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
Adam Powell [Thu, 19 Jul 2012 02:02:39 +0000 (19:02 -0700)]
Configure task affinity for main Settings activities
Change-Id: Iae98093a186a125f21bf807dfb1acc1a1bf4184a
The Android Open Source Project [Thu, 19 Jul 2012 15:52:27 +0000 (08:52 -0700)]
am
5924943c: Reconcile with jb-mr0-release jb-release
* commit '
5924943c91bd98781c358d904b10eb2638b442ea':
Display FCC id for LTE in Settings.
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:21:24 +0000 (20:21 -0700)]
am
4b7c4f1c: (-s ours) am
2bc05a27: Import translations. DO NOT MERGE
* commit '
4b7c4f1c12eb77d57670acc7f573747acd4f80d5':
Import translations. DO NOT MERGE
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
Wink Saville [Fri, 1 Jun 2012 21:37:21 +0000 (14:37 -0700)]
Test getAllCellInfo and onCellInfoChanged.
Change-Id: I20164d6bb9edb2ecf178b4533a39e885773d7b22