Justin Koh
0962a5cf35
am 7b065464
: Move BT settings appliance check after foreground check.
...
* commit '7b065464c996b792c1ecdd9d8c93db1bf0538b8d':
Move BT settings appliance check after foreground check.
2012-08-01 10:59:34 -07:00
Ravi Nagarajan
74b8a51d97
am dd2bf1d5
: am c70f5483
: Reset the priority on unbond
...
* commit 'dd2bf1d583bf186075b807152b98e3d30179cb2a':
Reset the priority on unbond
2012-08-01 00:46:42 -07:00
Swaminatha Balaji
82d3a75f73
am 8f94abd0
: am b45e3c8f
: Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
...
* commit '8f94abd065ba3498e5b5eb986608c9950c4365ff':
Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
2012-08-01 00:46:41 -07:00
Ganesh Ganapathi Batta
aa9ab830f3
am 8a0103df
: am 802956ec
: Add dev to cached dev list if entry is missing before auto connect
...
* commit '8a0103df4ef5425ca63071ab0b8db4b3cf00dbd2':
Add dev to cached dev list if entry is missing before auto connect
2012-08-01 00:46:40 -07:00
Ravi Nagarajan
dd2bf1d583
am c70f5483
: Reset the priority on unbond
...
* commit 'c70f5483553f5ff2bddc289ea8b7741bc81c9fbf':
Reset the priority on unbond
2012-08-01 00:44:12 -07:00
Swaminatha Balaji
8f94abd065
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
2012-08-01 00:44:09 -07:00
Ganesh Ganapathi Batta
8a0103df4e
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
2012-08-01 00:44:07 -07:00
Ravi Nagarajan
c70f548355
Reset the priority on unbond
...
Change-Id: I67b68bd70b947177218e0b908b79ebb9de9f45a8
2012-08-01 00:25:24 -07:00
Swaminatha Balaji
b45e3c8fe9
Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
...
Change-Id: I0716782a5308cc45297a30d0a7371286c75bfa52
2012-08-01 00:23:58 -07:00
Ganesh Ganapathi Batta
802956ec9b
Add dev to cached dev list if entry is missing before auto connect
...
Fix for BLTH01482218
Change-Id: I7d5cfad3eff872b5eb0b0c71804f25f3c3334557
2012-08-01 00:23:37 -07:00
Justin Koh
7b065464c9
Move BT settings appliance check after foreground check.
...
Move the BT settings appliance check after the foreground activity check.
This allows us to pair bt devices if we have a UI hooked up instead of never
allowing it.
TESTED = runs on Nexus Q.
Change-Id: I3c1ea4abb8d05236d91d2525934bec757cc5ca88
2012-07-31 18:32:39 -07:00
The Android Open Source Project
82b6c521af
am c6e71902
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'c6e719022734f3f030327022f757e50f54970baa':
2012-07-31 15:06:04 -07:00
The Android Open Source Project
c6e7190227
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Icc9358e5fffbcb4af923a9f66b59b15d6113fade
2012-07-31 15:04:02 -07:00
The Android Open Source Project
996a33fab6
am 721876d1
: (-s ours) am dbe1a24d
: am f6162c80
: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit '721876d13fb40b2c2a568ccdf6f989511991decd':
2012-07-31 14:55:10 -07:00
The Android Open Source Project
721876d13f
am dbe1a24d
: am f6162c80
: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'dbe1a24d3595bff9b911b46f34e12a18e55cab74':
2012-07-31 14:52:52 -07:00
The Android Open Source Project
dbe1a24d35
am f6162c80
: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'f6162c80cf048fe710f5cc0502fcfc052ff98385':
2012-07-31 14:51:08 -07:00
The Android Open Source Project
f6162c80cf
Reconcile with jb-mr0-release - do not merge
...
Change-Id: If5252c45f4163409ab8375e27cb13f3f06a237b6
2012-07-31 14:48:53 -07:00
The Android Automerger
2e1cf2aa70
merge in jb-mr0-release history after reset to jb-dev
2012-07-31 14:07:44 -07:00
The Android Automerger
19ee76801b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-07-31 07:35:31 -07:00
Ying Wang
e352946815
am 0b0a57c2
: (-s ours) am e2d5699d
: am 9691c1e6
: (-s ours) am 723bdf1e
: Import translations. DO NOT MERGE
...
* commit '0b0a57c2e4c4f14fe21db5ea45e2b78542760c21':
Import translations. DO NOT MERGE
2012-07-30 15:33:21 -07:00
Ying Wang
7b140e0df8
am 70095e71
: (-s ours) am df61ddc9
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '70095e71e4c13cec8851dacafa5fc38f595d5403':
Import translations. DO NOT MERGE
2012-07-30 15:30:19 -07:00
The Android Open Source Project
53f36d0d53
am 4d5d5107
: (-s ours) Reconcile with jb-mr1-release
...
* commit '4d5d510713ba79b044b0d62434e6067b2fb5fd01':
2012-07-30 15:16:42 -07:00
Ying Wang
0b0a57c2e4
am e2d5699d
: am 9691c1e6
: (-s ours) am 723bdf1e
: Import translations. DO NOT MERGE
...
* commit 'e2d5699d2592fb03c03c0d74ee414dcff31bbf90':
Import translations. DO NOT MERGE
2012-07-30 15:12:24 -07:00
Ying Wang
70095e71e4
am df61ddc9
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'df61ddc964eb626e5952cc3918d9b227fcc6e7b7':
Import translations. DO NOT MERGE
2012-07-30 15:10:37 -07:00
The Android Open Source Project
abbcdb75aa
am db7bda5c
: am c9976592
: am a62d7893
: Reconcile with jb-mr0-release jb-release
...
* commit 'db7bda5cc74a757c91917e01fe9693adcab16684':
2012-07-30 15:10:22 -07:00
Ying Wang
e2d5699d25
am 9691c1e6
: (-s ours) am 723bdf1e
: Import translations. DO NOT MERGE
...
* commit '9691c1e646b143690476724b1d7f8dc788cfe00f':
Import translations. DO NOT MERGE
2012-07-30 15:09:41 -07:00
Ying Wang
9691c1e646
am 723bdf1e
: Import translations. DO NOT MERGE
...
* commit '723bdf1ec561d211b45f20546e6938e68feebf39':
Import translations. DO NOT MERGE
2012-07-30 15:06:58 -07:00
The Android Open Source Project
4d5d510713
Reconcile with jb-mr1-release
...
Change-Id: I748fdd61c5644211f2406b42eefa521e4d7ed2d7
2012-07-30 15:05:14 -07:00
Ying Wang
df61ddc964
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-07-30 15:04:59 -07:00
The Android Open Source Project
db7bda5cc7
am c9976592
: am a62d7893
: Reconcile with jb-mr0-release jb-release
...
* commit 'c99765925dfa0e2e08861a71ea1c7d103e6080d0':
2012-07-30 14:47:35 -07:00
The Android Open Source Project
c99765925d
am a62d7893
: Reconcile with jb-mr0-release jb-release
...
* commit 'a62d7893891d044248553762cd34fe89dd2c7cd6':
2012-07-30 14:46:08 -07:00
The Android Open Source Project
a62d789389
Reconcile with jb-mr0-release jb-release
...
Change-Id: I1e66be92b8c13756b702c251c8b8f93bc8b07a83
2012-07-30 14:44:42 -07:00
Ying Wang
edbbbaca52
Import translations. DO NOT MERGE
...
Change-Id: If9d8b5f0aeda90d3f24326310f76e4ed563322cd
Auto-generated-cl: translation import
2012-07-30 14:28:39 -07:00
Ying Wang
894e3f4208
Import translations. DO NOT MERGE
...
Change-Id: Ia75c76064c1726e4453a5ce54bcfa137fe52f7de
Auto-generated-cl: translation import
2012-07-30 14:26:06 -07:00
Ying Wang
723bdf1ec5
Import translations. DO NOT MERGE
...
Change-Id: I6789871cb46bac62934f63182d2dacce3dda85e3
Auto-generated-cl: translation import
2012-07-30 13:25:03 -07:00
The Android Automerger
1c39268a32
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-07-30 09:46:10 -07:00
Irfan Sheriff
48eba3d948
am e93bc70c
: am dd4dd50f
: Merge "Fix DNS hint in settings" into jb-mr1-dev
...
* commit 'e93bc70c00a9f916e7dce7c706eba9e91caee3c3':
Fix DNS hint in settings
2012-07-29 22:37:13 -07:00
Irfan Sheriff
e93bc70c00
am dd4dd50f
: Merge "Fix DNS hint in settings" into jb-mr1-dev
...
* commit 'dd4dd50fe195d1642b67918e0e5ec83be9ee354d':
Fix DNS hint in settings
2012-07-29 22:33:37 -07:00
Irfan Sheriff
dd4dd50fe1
Merge "Fix DNS hint in settings" into jb-mr1-dev
2012-07-29 22:30:47 -07:00
Irfan Sheriff
ae0f6d9740
Fix DNS hint in settings
...
Change-Id: I382dbd60c2956a53a77547744790c33e93ce8404
2012-07-29 19:18:03 -07:00
Ying Wang
887b5e6080
am aecf1901
: (-s ours) am fdc600a4
: am 270a5503
: (-s ours) am eaeb8b61
: Import translations. DO NOT MERGE
...
* commit 'aecf1901d05e579cbbcde4111e6301ae84ff947d':
Import translations. DO NOT MERGE
2012-07-27 16:24:37 -07:00
Ying Wang
aecf1901d0
am fdc600a4
: am 270a5503
: (-s ours) am eaeb8b61
: Import translations. DO NOT MERGE
...
* commit 'fdc600a45be9c3ad5ae4e46fd75c76c38d39ccd9':
Import translations. DO NOT MERGE
2012-07-27 15:55:43 -07:00
Ying Wang
fdc600a45b
am 270a5503
: (-s ours) am eaeb8b61
: Import translations. DO NOT MERGE
...
* commit '270a55034107d16dc993b61871314a306cb03439':
Import translations. DO NOT MERGE
2012-07-27 15:51:10 -07:00
Ying Wang
270a550341
am eaeb8b61
: Import translations. DO NOT MERGE
...
* commit 'eaeb8b61d630e40dfe3851eb2a5f3300f3b30abe':
Import translations. DO NOT MERGE
2012-07-27 15:46:02 -07:00
Ying Wang
9e56c875d2
Import translations. DO NOT MERGE
...
Change-Id: Ia228d05c3fb39b5b7df90a0ac515fa7ed1d7417e
Auto-generated-cl: translation import
2012-07-27 12:30:02 -07:00
Ying Wang
eaeb8b61d6
Import translations. DO NOT MERGE
...
Change-Id: Id5983c861a0f8d50f39517bae9271dba88c9e530
Auto-generated-cl: translation import
2012-07-27 12:25:46 -07:00
The Android Automerger
85f947a77e
merge in jb-mr0-release history after reset to jb-dev
2012-07-26 17:49:58 -07:00
Amith Yamasani
a78862660a
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
2012-07-26 16:18:35 -07:00
Ying Wang
ce81270c46
am 98024d99
: (-s ours) am a7bb6922
: am afc96c1b
: (-s ours) am 4e53a0cb
: Import translations. DO NOT MERGE
...
* commit '98024d99fcb774094d8fab44c89e19ff526f7548':
Import translations. DO NOT MERGE
2012-07-26 16:18:34 -07:00
Amith Yamasani
ff1e3f3111
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
2012-07-26 16:15:23 -07:00