OSDN Git Service
fredc [Sat, 31 Mar 2012 06:27:24 +0000 (23:27 -0700)]
Initial checkin of OPP and PBAP
Change-Id: Ie43a26874bd5f0c00d69c2ce02430f4a16da327a
Syed Ibrahim M [Wed, 4 Apr 2012 06:51:13 +0000 (23:51 -0700)]
Updated the AdapterState class to handle persisted Bluetooth setting after AIRPLANE MODE OFF event
Change-Id: I5e1ca111b72ff49498e87149c32769997e545c54
Matthew Xie [Wed, 14 Mar 2012 00:24:54 +0000 (17:24 -0700)]
initial check in of rfcomm socket implementation Author: Zhenye Zhu, Matthew Xie
Change-Id: Ie3ab12c3bafc0a44e378a31c426c5eb41192f154
Matthew Xie [Fri, 23 Mar 2012 00:32:29 +0000 (17:32 -0700)]
Initial implementation of hdp service and jni
Change-Id: Ieca906080835098383cabbc13fa914363459f555
Kausik Sinnaswamy [Tue, 3 Apr 2012 10:01:12 +0000 (15:31 +0530)]
Fixed incorrect handling of the RSSI during inquiry which causes the devices to not get sorted properly.
Change-Id: Ib4eca5405a3393aef79f43943853adf76da23e76
Ravi Nagarajan [Fri, 30 Mar 2012 10:11:43 +0000 (15:41 +0530)]
ATD commands have a trailing ';'. Remove the trailing ';' prior to dialing a call. Else a send tone popup is received.
Change-Id: Icbd53166001d3be102bac6a8d2f782cb22c4dc56
Sreenidhi T [Fri, 30 Mar 2012 08:26:34 +0000 (01:26 -0700)]
Fixed the pairing variant check typo.
Change-Id: I1a835531bc35cc6b1a178a0d131a86715df6f3f0
Ravi Nagarajan [Wed, 28 Mar 2012 13:41:30 +0000 (19:11 +0530)]
Resolved HSP PTS issues. When call is active, and CKPD is received: 1. If audio is not ON, audio will be enabled 2. If audio is ON, call with be disconnected (fixed a typo here, which answered the call, instead of hangup)
Change-Id: Ib60f7109f9fe982523c3db68ea6014c25bad8262
Ravi Nagarajan [Tue, 27 Mar 2012 14:47:36 +0000 (20:17 +0530)]
Integrate HFP with VR app. Handle both cases where VR is started by peer as well as launched from the phone
Change-Id: Icf2922f4caf20190fdb3f0afa2ddd19d1852c4fb
Matthew Xie [Thu, 22 Mar 2012 06:11:40 +0000 (23:11 -0700)]
initial implementation of hid service and jni
Change-Id: I527651bd85ad3adddbf4b89802f4a6128c9fa047
Kausik Sinnaswamy [Wed, 21 Mar 2012 09:44:32 +0000 (15:14 +0530)]
Caching callbackEnv in HFP/A2DP JNI results in the ENV going out-of-syn after an disassociate_evt/associate_evt sequence. Removed the caching.
Change-Id: Iebe3d2b3fa632c3332be82291bf32ace62c30ad5
Matthew Xie [Tue, 20 Mar 2012 03:40:36 +0000 (20:40 -0700)]
Fix persistent audio on, Donot connect_audio when enter CONNECTED state. Process DISCONNECT message in AudioOn state.
Change-Id: Id89842ff2179234c320752ae69dcf3c99b125bce
Matthew Xie [Thu, 8 Mar 2012 23:15:37 +0000 (15:15 -0800)]
process slc_connect state change event, query and send stack the phone state
Change-Id: I4472384290d87f13f7be5647327c789c01582a7b
Matthew Xie [Mon, 19 Mar 2012 20:54:17 +0000 (13:54 -0700)]
Revert "fix persistent audio on, Donot connect_audio when enter CONNECTED state"
This reverts commit
3ce52a01d734e73a21074ab8397cf67b16d6595f
Hi Matt,
I reviewed your changes (2), and they look good. However, your changes in (1), seem to be causing a side-effect while testing the headset connection setup while call is active/outgoing/incoming. Since this change was merged, I am sending my comments thru email.
Here is the scenario
1. No headset connection
2. Place an outgoing call, and answer it at the remote side
3. Initiate connection from headset
4. SCO seems to be setup by Java side even before SLC setup completes
ISSUE#1: Once Java receives connection event, it automatically calls connect_audio, even though SLC has not been setup
ð Can you make a change to call connect_audio, only after SLC is complete? If this difficult to do, can this code just be removed, as the stack will do automatically after SLC setup when phone_state_change is called
ISSUE#2: If we redo this for an outgoing call (call answered prior to headset connection), then the Java side does not initiate SCO audio
ð To have a consistent behavior, if Java side is setting up SCO for active call, shouldn’t we be doing the same for outgoing call too?
Thanks
Ravi
Matthew Xie [Fri, 9 Mar 2012 22:06:35 +0000 (14:06 -0800)]
fix persistent audio on, Donot connect_audio when enter CONNECTED state
Change-Id: Ieb2c327ab562c02f293fa616e555ed5a8dc55570
Matthew Xie [Sat, 10 Mar 2012 19:47:01 +0000 (11:47 -0800)]
output call back event information
Change-Id: I6a84a19f91fbb102668745623327f7e234c2ad5d
Matthew Xie [Fri, 9 Mar 2012 18:53:58 +0000 (10:53 -0800)]
Save volumes and notify stack only when they change
Change-Id: Ibcf6a55111ee3d6ecab6ecd75ab957258b35e49c
Ravi Nagarajan [Fri, 9 Mar 2012 03:30:20 +0000 (09:00 +0530)]
Added new state BT_BOND_STATE_BONDING. Stack will send a callback for all three states, app does not have to rely on the api return code to switch to bonding. This addresses the incoming pairing as well as the remote unpaired test cases
Change-Id: I37208e5bae7264a0ff78195322ba0a6bd1d82f0f
Matthew Xie [Thu, 8 Mar 2012 19:49:34 +0000 (11:49 -0800)]
update call state to match hf hal header, memory dial fix null pointer
Change-Id: I62f26d0259a910ac80d7a18c6bef49abb6eab820
Matthew Xie [Fri, 17 Feb 2012 02:47:53 +0000 (18:47 -0800)]
Initial implementation of HFP and A2DP profile/service/statemachine.
Change-Id: Ic6e6d358b94313f237b7be61b70dcc6f4f7902e7
Jaikumar Ganesh [Wed, 7 Mar 2012 22:59:45 +0000 (14:59 -0800)]
Incoming pairing issue.
Change-Id: Idd77d49a9d6df94e6dc9dfe4f179e93641d48261
Jaikumar Ganesh [Wed, 7 Mar 2012 18:24:35 +0000 (10:24 -0800)]
Fix Bond State Machine device list.
The device list was adding the device twice.
Note: This whole class should be removed and moved to
the stack.
Change-Id: I6086ee98bd1b4088a90b76f67a9fff21987f4b04
Jaikumar Ganesh [Wed, 7 Mar 2012 18:04:29 +0000 (10:04 -0800)]
Set scan mode to be connectable when turning on.
If scan mode is not set, set it to be connectable.
Change-Id: I146505dade5d46aa70068cdaada94c06f30d75de
Jaikumar Ganesh [Wed, 7 Mar 2012 01:11:58 +0000 (17:11 -0800)]
Add ability to persist Bluetooth state.
Currently, BT is turned on when the Service is started,
if needed. This needs to be changed when BT is not a persistent
process.
Change-Id: I1c36aa75824622a739241d6d4e9aeacbf46e56af
Kausik Sinnaswamy [Wed, 7 Mar 2012 00:11:49 +0000 (16:11 -0800)]
Merged the Passkey request callback and the passkey reply APIs into the SSP API and callback respectively
Change-Id: I2b8fb1665586d32b0ada1b882cbde1d232233803
Chia-chi Yeh [Wed, 7 Mar 2012 00:15:47 +0000 (16:15 -0800)]
Bluetooth: declare shared libraries as its build dependencies.
Change-Id: I9999051d31fe8d8387d0002275a15be53ea02c30
Jaikumar Ganesh [Tue, 6 Mar 2012 20:51:10 +0000 (12:51 -0800)]
Remove passkey callback.
Use ssp callback for all 3 forms of 2.1 pairing.
Change-Id: I13af1eecc3469e4db8e656717700a1f9166177e3
Jaikumar Ganesh [Tue, 6 Mar 2012 23:41:25 +0000 (15:41 -0800)]
Fix scan mode bug.
The incorrect paramter was being passed.
Change-Id: Icc119811d61ffa537b837a6712a85ea9dcefaa87
Matthew Xie [Wed, 29 Feb 2012 01:52:36 +0000 (17:52 -0800)]
Correct the length of bd_address setting.
The length of name was used to set address. This caused a index out
bound exception in pinReqestCallback.
Change-Id: Ia152f370470f14f9770d734ca7572ec8e8c5b8b3
Jaikumar Ganesh [Mon, 27 Feb 2012 18:30:33 +0000 (10:30 -0800)]
Add NET_ADMIN permission.
This is needed as the shared library
talks to the rfkill interface.
Change-Id: Id9fdc809ac8077240e57d9a7a46bb23913a40940
Jaikumar Ganesh [Tue, 21 Feb 2012 20:06:55 +0000 (12:06 -0800)]
Fix Bluetooth enable issue.
The stack sends all the property changes,
before sending enable. Hence, we don't need to
wait anymore.
Also fix the return value check for get_property.
Change-Id: Icac32cd74f9028c40ab6b5018b576168c9dac3b9
Jaikumar Ganesh [Fri, 17 Feb 2012 01:46:00 +0000 (17:46 -0800)]
Fix makefile for jni directory build.
Change-Id: I47bf6e955517ffdbd914ee3c1d87565d0cc3f3a4
Jaikumar Ganesh [Mon, 19 Dec 2011 23:54:50 +0000 (15:54 -0800)]
Initial commit for new Bluetooth stack interface.
1. Changes to Android.mk file
2. changes to make the process persistent. This is temporary.
3. Addition of new java and jni classes.
Change-Id: I2453c7a1a475c66bf52f3a84cd8beb12dd37b87a
Jaikumar Ganesh [Thu, 2 Feb 2012 18:54:37 +0000 (10:54 -0800)]
Comments opp and PBAP init code when BT gets enabled.
Change-Id: Id1b9329cb4dba7f4d4e5f478a775bcfd18a68a66
Matthew Xie [Mon, 16 Jul 2012 22:09:38 +0000 (15:09 -0700)]
Merge "Revert "first patch of test submit""
Matthew Xie [Mon, 16 Jul 2012 22:09:33 +0000 (15:09 -0700)]
Revert "first patch of test submit"
This reverts commit
1429606cdb0c5b4410a224697e0ac2459ebe4cb7
Matthew Xie [Mon, 16 Jul 2012 22:09:10 +0000 (15:09 -0700)]
Merge "Revert "second patch of test submit""
Matthew Xie [Mon, 16 Jul 2012 22:09:03 +0000 (15:09 -0700)]
Revert "second patch of test submit"
This reverts commit
4b3b8ab47daf6cddf3bfa00c418ea436bc4cecb8
Matthew Xie [Mon, 16 Jul 2012 22:07:25 +0000 (15:07 -0700)]
Revert "third patch of test submit"
This reverts commit
448de2e7f9e33c099207c80a8135f7a125b995f6
Matthew Xie [Mon, 16 Jul 2012 21:41:41 +0000 (14:41 -0700)]
third patch of test submit
Change-Id: If555a371dd602034e06d8887cb37b457d2b22c40
Matthew Xie [Mon, 16 Jul 2012 21:41:26 +0000 (14:41 -0700)]
second patch of test submit
Change-Id: Ib78a55ac1355e65b1db85a87f6e18006f0553be9
Matthew Xie [Mon, 16 Jul 2012 21:41:11 +0000 (14:41 -0700)]
first patch of test submit
Change-Id: Ief4f86f471ac62b11b9dcd4cae937d7fb261ba69
Ying Wang [Mon, 16 Jul 2012 17:31:33 +0000 (10:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia17635574edaa85a69282d79dfeeabe1d2b45785
Auto-generated-cl: translation import
Ying Wang [Fri, 13 Jul 2012 17:52:38 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0b52f5f3648c7fc487423a36179ae027fc59be27
Auto-generated-cl: translation import
The Android Open Source Project [Tue, 19 Jun 2012 13:16:04 +0000 (06:16 -0700)]
The Android Open Source Project [Tue, 19 Jun 2012 13:13:45 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: I6f6cabff925336ddccc4af80658712c63401e123
Matthew Xie [Mon, 18 Jun 2012 17:52:19 +0000 (10:52 -0700)]
am
9544eed6: am
5cb59523: Change timestamp type from int to long, timestamp(now) overflows int
* commit '
9544eed6411624e1a4df7039578cd076ae871540':
Change timestamp type from int to long, timestamp(now) overflows int
Ying Wang [Mon, 18 Jun 2012 17:48:03 +0000 (10:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I656294308cdf985be3d66707e8e861fc2f29a82f
Matthew Xie [Mon, 18 Jun 2012 17:32:25 +0000 (10:32 -0700)]
am
5cb59523: Change timestamp type from int to long, timestamp(now) overflows int
* commit '
5cb59523d7d7e25c58bd99c100c50e49c78481ce':
Change timestamp type from int to long, timestamp(now) overflows int
The Android Automerger [Sat, 16 Jun 2012 14:03:33 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Matthew Xie [Fri, 15 Jun 2012 21:47:10 +0000 (14:47 -0700)]
Change timestamp type from int to long, timestamp(now) overflows int
BluetoothOppNotification NotificationItem.timeStamp is int, too
small to be a timestamp
bug
6670668
Change-Id: Ieec5377bac3b8c7fbaa24d059ad5957ba9a0544f
Eric Fischer [Mon, 11 Jun 2012 17:44:39 +0000 (10:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie6a90b13c2e2072d82a1f165d680d390a9963fae
The Android Open Source Project [Tue, 29 May 2012 16:44:52 +0000 (09:44 -0700)]
The Android Open Source Project [Tue, 29 May 2012 16:41:08 +0000 (09:41 -0700)]
Reconcile with jb-release
Change-Id: I864bf6c218289fd89744dfba369fb2941c829bb6
The Android Automerger [Tue, 29 May 2012 15:58:44 +0000 (08:58 -0700)]
merge in jb-release history after reset to jb-dev
Martijn Coenen [Fri, 25 May 2012 22:40:48 +0000 (15:40 -0700)]
am
5c39fcdf: am
03f25a20: Bluetooth OPP: Allow sending all mime-types for handover.
* commit '
5c39fcdf7499aa3a2f94e29c6c99594620cb3c78':
Bluetooth OPP: Allow sending all mime-types for handover.
Martijn Coenen [Fri, 25 May 2012 22:37:40 +0000 (15:37 -0700)]
am
03f25a20: Bluetooth OPP: Allow sending all mime-types for handover.
* commit '
03f25a2055e51bcc5e8870642763b502956b6830':
Bluetooth OPP: Allow sending all mime-types for handover.
Eric Fischer [Fri, 25 May 2012 18:46:33 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I26e9934bdf128b172cd556afe5c011dfddad0b28
Martijn Coenen [Fri, 18 May 2012 20:43:30 +0000 (13:43 -0700)]
Bluetooth OPP: Allow sending all mime-types for handover.
This change allows sending of all mime-types through
ACTION_HANDOVER_SEND and ACTION_HANDOVER_SEND_MULTIPLE.
These intent actions are only used by NFC when doing
handover transfers, and require the whitelisting
permission that is only granted to system applications.
Similarly, for receiving, we will still reject certain
mimetypes, except if the transfer was whitelisted because
it was a handover transfer.
At this moment, only the NFC service has the signature
permission required for whitelisting.
This change also allows to send files without extension,
as long as OPP has a valid mimeType. This is useful when
using OPP in combination with a content provider, which
may specify filenames without any extension but with a
valid mime-type.
Bug:
6561169
Change-Id: Ia39418de6bcb2f8af678c7b8637b63b1697eb493
Martijn Coenen [Thu, 24 May 2012 18:13:51 +0000 (11:13 -0700)]
am
1723245e: am
acc04ecb: Merge "Fix variable initialization." into jb-dev
* commit '
1723245e387454fbcda74cda6d5efeee7e148bda':
Fix variable initialization.
Martijn Coenen [Thu, 24 May 2012 18:01:00 +0000 (11:01 -0700)]
am
acc04ecb: Merge "Fix variable initialization." into jb-dev
* commit '
acc04ecbd174b07d580248aaf6640c3d2b42ca49':
Fix variable initialization.
Martijn Coenen [Thu, 24 May 2012 17:57:09 +0000 (10:57 -0700)]
Merge "Fix variable initialization." into jb-dev
Martijn Coenen [Thu, 24 May 2012 17:47:08 +0000 (10:47 -0700)]
Fix variable initialization.
This could cause Bluetooth file transfers to fail.
Change-Id: I69b91e84cb7df1f147581e37f056eeacd54687d8
The Android Open Source Project [Mon, 21 May 2012 21:28:43 +0000 (14:28 -0700)]
am
dfec441e: Reconcile with jb-release nakasi-factoryrom-release
* commit '
dfec441ecb64861c4e7683be1e55331cddf6341b':
The Android Open Source Project [Sat, 19 May 2012 01:43:40 +0000 (18:43 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: If4904e84859a14006a3669574a6ab1e7a87949e7
The Android Automerger [Fri, 18 May 2012 17:48:16 +0000 (10:48 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
Martijn Coenen [Thu, 17 May 2012 22:33:34 +0000 (15:33 -0700)]
am
6fdfaf58: am
4bfe5662: Merge "Allow bluetooth OPP transfers to be stopped." into jb-dev
* commit '
6fdfaf5837acd52f85b2df1b2d90d8d21a32335f':
Allow bluetooth OPP transfers to be stopped.
Martijn Coenen [Thu, 17 May 2012 22:33:33 +0000 (15:33 -0700)]
am
63397ede: am
3cb57672: Merge "Don\'t MediaScan files received through handover." into jb-dev
* commit '
63397ede92efd0a31bde340bc301eb3962e3f195':
Don't MediaScan files received through handover.
Martijn Coenen [Thu, 17 May 2012 22:33:33 +0000 (15:33 -0700)]
am
20e0594a: am
3236357a: Merge "Add BT address and mimeType to handover intents." into jb-dev
* commit '
20e0594a8deef6d308c6b61e037aa0a40ce1404f':
Add BT address and mimeType to handover intents.
The Android Automerger [Thu, 17 May 2012 14:04:04 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Martijn Coenen [Wed, 16 May 2012 22:54:37 +0000 (15:54 -0700)]
am
4bfe5662: Merge "Allow bluetooth OPP transfers to be stopped." into jb-dev
* commit '
4bfe5662b7169484d32186a2042cb88cdbc446ba':
Allow bluetooth OPP transfers to be stopped.
Martijn Coenen [Wed, 16 May 2012 22:54:37 +0000 (15:54 -0700)]
am
3cb57672: Merge "Don\'t MediaScan files received through handover." into jb-dev
* commit '
3cb57672cefbe78bf89590fb3053b4ab4ecd461b':
Don't MediaScan files received through handover.
Martijn Coenen [Wed, 16 May 2012 22:54:36 +0000 (15:54 -0700)]
am
3236357a: Merge "Add BT address and mimeType to handover intents." into jb-dev
* commit '
3236357a784d1bfb6c717115b10a227c98de2a97':
Add BT address and mimeType to handover intents.
Martijn Coenen [Wed, 16 May 2012 22:51:41 +0000 (15:51 -0700)]
Merge "Allow bluetooth OPP transfers to be stopped." into jb-dev
Martijn Coenen [Wed, 16 May 2012 22:51:34 +0000 (15:51 -0700)]
Merge "Don't MediaScan files received through handover." into jb-dev
Martijn Coenen [Wed, 16 May 2012 22:51:26 +0000 (15:51 -0700)]
Merge "Add BT address and mimeType to handover intents." into jb-dev
Martijn Coenen [Wed, 16 May 2012 20:58:02 +0000 (13:58 -0700)]
Allow bluetooth OPP transfers to be stopped.
If handover requesters such as NFC want to cancel an
ongoing transfer, they can use this intent. It requires
the same permission that is used for whitelisting,
which at this point is only granted to the NFC service.
Change-Id: I89e27550d700c4a29a892dba99fda740d8845642
The Android Open Source Project [Wed, 16 May 2012 15:45:28 +0000 (08:45 -0700)]
am
e91ea9c2: Reconcile with jb-release nakasi-factoryrom-release
* commit '
e91ea9c24580dfbff0c79feccdf5a6081083352f':
The Android Open Source Project [Wed, 16 May 2012 15:40:52 +0000 (08:40 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I5223737e6ad30352b2328d5bf42c347f2fdc5e17
The Android Automerger [Wed, 16 May 2012 14:45:38 +0000 (07:45 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Automerger [Wed, 16 May 2012 14:03:59 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Tue, 15 May 2012 22:54:25 +0000 (15:54 -0700)]
am
6cd6503d: (-s ours) Import translations. DO NOT MERGE
* commit '
6cd6503d5a0388e43a08e456a53905dbefa57e3a':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 15 May 2012 22:47:39 +0000 (15:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7d168410259b50cec8509b46a87f7b252cc0044f
Eric Fischer [Tue, 15 May 2012 22:47:04 +0000 (15:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I66cea0e6b7a5e9377cb77e75ac21914fbbc95de4
Martijn Coenen [Tue, 15 May 2012 21:36:06 +0000 (14:36 -0700)]
Don't MediaScan files received through handover.
Handover providers such as NFC may move the file in the filesystem
(out of /bluetooth), hence it's better not to scan them here.
Change-Id: Ic374c5ae880cb65e2d8a9ce615115b51fdc29353
Martijn Coenen [Mon, 14 May 2012 17:09:01 +0000 (10:09 -0700)]
Add BT address and mimeType to handover intents.
Also, allow refreshing whitelisted entries by sending
another whitelist intent.
Change-Id: If85db397e31364939c67b3018413b625a1888ae6
The Android Automerger [Fri, 4 May 2012 23:14:18 +0000 (16:14 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Fri, 4 May 2012 18:27:50 +0000 (11:27 -0700)]
am
446d4dc5: (-s ours) Import translations. DO NOT MERGE
* commit '
446d4dc5053b59a53d9f65a127bb057d7328d858':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 4 May 2012 18:21:55 +0000 (11:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib59f043d47362a82c7d6ccd4b5a64dcc7ddc26a8
Eric Fischer [Fri, 4 May 2012 18:21:23 +0000 (11:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9862cbb427bcb5be81af2e09cc71208c1456be05
Eric Fischer [Thu, 3 May 2012 20:21:18 +0000 (13:21 -0700)]
am
afd7ca75: (-s ours) Import translations. DO NOT MERGE
* commit '
afd7ca756d2f6d639a99b6d4626989d91ef5125f':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 3 May 2012 20:09:33 +0000 (13:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I025d3f6555ea2e2e97d38fd24d4f1b3faa321fd6
Eric Fischer [Thu, 3 May 2012 20:08:57 +0000 (13:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie86c651cb588dec834c629a429ddee49ca51bdd5
The Android Automerger [Thu, 3 May 2012 14:15:05 +0000 (07:15 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Wed, 2 May 2012 19:24:29 +0000 (12:24 -0700)]
am
7eff23ee: (-s ours) Import translations. DO NOT MERGE
* commit '
7eff23eeb2e76d9f434bef7a954ea0d5ade5e28d':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 2 May 2012 18:30:53 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: If50e8da1c98d5e0d45e61e5bfbf6e72e1a1a033b
Eric Fischer [Wed, 2 May 2012 18:30:02 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I476bff54ef18b9d35405429e0550d3e7b61971db
The Android Automerger [Wed, 2 May 2012 14:06:46 +0000 (07:06 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Tue, 1 May 2012 18:03:54 +0000 (11:03 -0700)]
am
d35635c0: (-s ours) Import translations. DO NOT MERGE
* commit '
d35635c0d53b865b485bd342c1e712b78f0443a7':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 1 May 2012 17:49:44 +0000 (10:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddc28b772ef5448d41f35bfe25f74f1158613d83