]>
nv-tegra.nvidia Code Review - android/platform/packages/providers/DownloadProvider.git/log
Jeff Sharkey [Thu, 13 Dec 2012 20:58:18 +0000 (12:58 -0800)]
Cancel stale notifications when starting.
Bug:
7693834
Change-Id: I5e212be321cccae0f7c76f80049c4e09f0867694
Baligh Uddin [Wed, 12 Dec 2012 17:48:12 +0000 (09:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icadeb210d13e600f85b1a1d21aaaa79e26d78240
Auto-generated-cl: translation import
Baligh Uddin [Thu, 6 Dec 2012 16:20:19 +0000 (08:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6882b2a17c13803e66b1afc8e0bc02dd3d4bf049
Auto-generated-cl: translation import
Baligh Uddin [Wed, 5 Dec 2012 18:21:54 +0000 (10:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia4dc102097a8c6085e20d7fc7e2e10adc475f872
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Nov 2012 15:40:10 +0000 (07:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I195b9b502336dad204ce6b4e9a1a74cc9f9f398f
Auto-generated-cl: translation import
Jeff Sharkey [Wed, 28 Nov 2012 23:13:12 +0000 (15:13 -0800)]
Merge "Improve download remaining time calculation." into jb-mr1.1-dev
Jeff Sharkey [Wed, 28 Nov 2012 22:35:40 +0000 (14:35 -0800)]
Improve download remaining time calculation.
Calculate remaining time in DownloadNotifier so we always use the
most recent progress data, which avoids showing stale times.
Weight speed calculation to prefer historical data so remaining time
is smoother on bumpy network connections.
Bug:
7631948
Change-Id: I497be0899e65086356745340b19d3987c6185bdd
Jeff Sharkey [Wed, 28 Nov 2012 00:11:07 +0000 (16:11 -0800)]
Merge "Update extras for in-progress download." into jb-mr1.1-dev
Jeff Sharkey [Tue, 27 Nov 2012 21:47:24 +0000 (13:47 -0800)]
Update extras for in-progress download.
Follow move to EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS extras, which
was missing during refactoring.
Bug:
7617373
Change-Id: I26203a2bc6fc0e211a1aa602c0de018332d76f60
Baligh Uddin [Tue, 27 Nov 2012 20:06:10 +0000 (12:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib11120e47f29151b4281f86db6dbeaecf4e060d5
Auto-generated-cl: translation import
Baligh Uddin [Fri, 23 Nov 2012 05:19:30 +0000 (21:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8aa3828fb38dc088148dbe588735364ccb09bee5
Auto-generated-cl: translation import
Baligh Uddin [Wed, 21 Nov 2012 05:58:24 +0000 (21:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5fe1cabbe3d55843bb3155efb5c0c00a511b04fd
Auto-generated-cl: translation import
Baligh Uddin [Fri, 16 Nov 2012 21:02:06 +0000 (13:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I79fc66232d0405d1a631ff00ae21579baa4d6a3f
Auto-generated-cl: translation import
Jeff Sharkey [Thu, 15 Nov 2012 19:49:21 +0000 (11:49 -0800)]
Merge "Show remaining time in download notifications." into jb-mr1.1-dev
Jeff Sharkey [Tue, 13 Nov 2012 00:50:17 +0000 (16:50 -0800)]
Show remaining time in download notifications.
Calculate speed of in-progress downloads and estimate time remaining
until completion. Uses a moving average that is weighted 1:1 with
the most recent 500ms sample. Funnels timing data to notifications
through DownloadHandler.
Bug:
6777872
Change-Id: I9155f2979aa330bd1172f63bbfca1d053815cee5
Baligh Uddin [Wed, 14 Nov 2012 16:48:12 +0000 (08:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6ca8a2ceef5a5ad54a9cff1b4194669762d637cf
Auto-generated-cl: translation import
Jeff Sharkey [Fri, 3 Aug 2012 04:58:17 +0000 (21:58 -0700)]
Rewrite of download notifications.
Switch to using new inbox-style notifications when collapsing multiple
downloads. Correctly handles clustering, including cancellation of
stale notifications. All notifications are now handled in a single
class, making it easier to reason about correctness.
Fixed bugs around handling of visibility flags. Move away from using
"int" as internal keys, since they can overflow. Started work for
time estimates, will finish in a future CL.
Explicitly pass all relevant IDs to DownloadReceiver instead of doing
a second racy query. Fix StrictMode warnings when querying in
DownloadReceiver.
Bug:
6777872 ,
5463678 ,
6663547 ,
6967346 ,
6634261 ,
5608365
Change-Id: I5eb47b73b90b6250acec2ce5bf8d7a274ed9d3a9
Jeff Sharkey [Thu, 25 Oct 2012 00:18:32 +0000 (17:18 -0700)]
Better sanity checking for finished downloads.
Downloads in the RUNNING state are considered ready to start so that
downloads are correctly resumed when the process crashes. However,
this causes a race condition while UpdateThread is processing a
Cursor when a DownloadThread finishes.
With this change, DownloadThread now skips requests for downloads
already marked as finished. Apps listening for the DOWNLOAD_COMPLETE
broadcast will no longer see data mutated by the second thread, and
will not see the broadcast duplicated.
Bug:
6948938 ,
6970458 ,
6818900
Change-Id: I35deac3cedbfe7f50091fab5818d85594dba558c
Jeff Sharkey [Fri, 19 Oct 2012 21:42:24 +0000 (14:42 -0700)]
Bring back DRM mimetypes.
I don't like DRM, but other people do.
Bug:
7370549
Change-Id: I44220404eab6e6cc85ea16cfcf58474135c03f83
Jason Chen [Fri, 12 Oct 2012 15:50:10 +0000 (08:50 -0700)]
Let's enhance
Add mipmap-xxhdpi launcher icon asset.
Bug:
6718166
Change-Id: I9fbe8e6c5345fddc78b0129e329205aaf973ea6c
Jeff Sharkey [Fri, 5 Oct 2012 22:09:00 +0000 (15:09 -0700)]
Skip scanning a file which will be deleted.
When deleting a download, don't bother scanning it, since we'll just
delete it moments later. This was already racy since it didn't even
wait for the scan to complete.
Bug:
7256243
Change-Id: I8c3b96823d94bc1688ef336cb45746ccd35fc760
Jeff Sharkey [Wed, 3 Oct 2012 18:26:56 +0000 (11:26 -0700)]
Handle not fully connected networks.
When checking network status, treat non-connected networks as
disconnected. This handles cases like captive portal checks, and
slow DHCP servers.
Bug:
7264340
Change-Id: I0b466cee5d5cb73037f3fb209c583711b8f9eefd
Ruben Brunk [Fri, 28 Sep 2012 18:28:23 +0000 (11:28 -0700)]
Merge "Remove FLAG_ACTIVITY_NEW_TASK from the VIEW intent." into jb-mr1-dev
Ben Gruver [Thu, 27 Sep 2012 18:12:30 +0000 (11:12 -0700)]
Send uid of the application that initiated the download
Bug:
6923241
Change-Id: Idf4037b4e360cb6453b315d1cc95608762c9e0c8
Ruben Brunk [Mon, 24 Sep 2012 21:37:19 +0000 (14:37 -0700)]
Remove FLAG_ACTIVITY_NEW_TASK from the VIEW intent.
Bug:
7164238
Bug:
7237908
Got rid of FLAG_ACTIVITY_NEW_TASK for proper back behavior
Change-Id: I50af9aeafb27d6079bda4f81f4a116b6bb600676
Romain Guy [Thu, 13 Sep 2012 23:19:46 +0000 (16:19 -0700)]
Properly dispatch checkbox toggling
Bug #
6995003
Change-Id: I3dba57d7ee9697bfdb976432096c680a0f0a4480
Jeff Sharkey [Tue, 28 Aug 2012 04:53:30 +0000 (21:53 -0700)]
Send ORIGINATING_URI and REFERRER to installer.
When building PackageInstaller intents, include ORIGINATING_URI and
REFERRER extras. Unify view intent building for both notifications
and list UI.
Bug:
6900672
Change-Id: I18435e0f8aa549880ec594f82b6a250232706135
Jean-Baptiste Queru [Wed, 8 Aug 2012 17:58:29 +0000 (10:58 -0700)]
am
d7dd6019 : Merge "Adds missing Bluetooth as network type."
* commit '
d7dd6019baf12961dce722d33003e238cdd72f6a ':
Adds missing Bluetooth as network type.
Jean-Baptiste Queru [Wed, 8 Aug 2012 17:44:30 +0000 (10:44 -0700)]
Merge "Adds missing Bluetooth as network type."
Nick Kralevich [Sat, 28 Jul 2012 22:29:30 +0000 (15:29 -0700)]
Explicitly export content providers
In a future version of Android, the default value for
<provider android:exported> will change from true to false.
Explicitly set android:exported="true"
Bug:
3306452
Change-Id: Id23f16a8527ba97be1d8617ccfc4346734f695d0
Jeff Sharkey [Wed, 25 Jul 2012 00:42:25 +0000 (17:42 -0700)]
Move notification tests to LittleMock.
Directly mock NotificationManager instead of using SystemFacade.
Change-Id: If932d26e23816e8674469c275a828701cce5fc2d
Jeff Sharkey [Fri, 20 Jul 2012 23:08:36 +0000 (16:08 -0700)]
Merge "Reduce deletion logging."
Jeff Sharkey [Fri, 20 Jul 2012 23:06:35 +0000 (16:06 -0700)]
Reduce deletion logging.
Bug:
6544953
Change-Id: I4157c67b9b9cddab4ade795c328a202f6a230f95
Ying Wang [Fri, 20 Jul 2012 18:11:31 +0000 (11:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50f7efa62f6cb011cc8cda96b572e0327481e275
Auto-generated-cl: translation import
Ying Wang [Wed, 18 Jul 2012 19:41:11 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4fb5bdc4c7aff92e7d04cdfbd61d985539a25be4
Auto-generated-cl: translation import
Ying Wang [Mon, 16 Jul 2012 17:42:46 +0000 (10:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id1e521b41e4807247a99c2d4fac6b092799c4097
Auto-generated-cl: translation import
Ying Wang [Fri, 13 Jul 2012 18:04:09 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icb03811c70a091981b748e50004b2db597c68280
Auto-generated-cl: translation import
Håkan3 Johansson [Wed, 8 Feb 2012 20:07:27 +0000 (21:07 +0100)]
Adds missing Bluetooth as network type.
The network connection type for Bluetooth is added so
that it is possible to use Bluetooth as Hotspot during
download from the Internet.
Change-Id: Ic32b083068d8316a41f2c31a3575a28163f6c7f3
Svetoslav Ganov [Tue, 3 Jul 2012 21:36:02 +0000 (14:36 -0700)]
No echo or earcon after checking/unchecking items in the download screen.
1. The problem is that download provider is using a custom view to intercept
clicks to toggle the state of the nested check box. However, the when
toggling the code is not calling performClick() on the check box which
aside of toggling will also send the right accessibility event.
bug:
6705105
Change-Id: Ia7253ff05f6e4575a346b9aaf3fbceecd68b9782
Ying Wang [Mon, 18 Jun 2012 18:05:40 +0000 (11:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia9138f7b8611650a3dfab998de558c1b53b0f27b
The Android Open Source Project [Mon, 11 Jun 2012 16:25:46 +0000 (09:25 -0700)]
The Android Open Source Project [Mon, 11 Jun 2012 16:22:52 +0000 (09:22 -0700)]
Reconcile with jb-release
Change-Id: I498fdba3aa0836ff4f4f42e43e0e7a5d94dfa25d
The Android Automerger [Fri, 8 Jun 2012 15:22:49 +0000 (08:22 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Thu, 7 Jun 2012 20:16:23 +0000 (13:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e117db77c61afa73e9d2bdaeb6080270ac4ca4c
Jeff Sharkey [Thu, 7 Jun 2012 18:28:40 +0000 (11:28 -0700)]
am
c5b582ce : am
f918429d : Uniform "when" to avoid flashing notifications.
* commit '
c5b582cebe167264106df5fa7b2ae7312cd456ce ':
Uniform "when" to avoid flashing notifications.
Jeff Sharkey [Thu, 7 Jun 2012 18:25:52 +0000 (11:25 -0700)]
am
f918429d : Uniform "when" to avoid flashing notifications.
* commit '
f918429d0c1927a19d688baa26a07c2c65765580 ':
Uniform "when" to avoid flashing notifications.
Jeff Sharkey [Thu, 7 Jun 2012 18:10:18 +0000 (11:10 -0700)]
Uniform "when" to avoid flashing notifications.
When showing a download, remember the first timestamp when we showed
a notification, and use that time as "when" for all future updates
to avoid flashing.
Also bring back icon animation that had regressed.
Bug:
6596416 ,
6237256
Change-Id: Ifdc5dc6870dac047515151c1b088e6e379b6a063
The Android Open Source Project [Thu, 7 Jun 2012 14:55:56 +0000 (07:55 -0700)]
The Android Open Source Project [Thu, 7 Jun 2012 14:51:35 +0000 (07:51 -0700)]
Reconcile with jb-release
Change-Id: Icc86c6dba50bad25e4031c47a2580a1af4eeeb1e
The Android Automerger [Wed, 6 Jun 2012 14:04:53 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Sharkey [Tue, 5 Jun 2012 23:06:29 +0000 (16:06 -0700)]
am
8c4f4292 : am
03fcf943 : Download items should always fit screen.
* commit '
8c4f42924ba55d636d19caeb2ccbdd7e32edc443 ':
Download items should always fit screen.
Jeff Sharkey [Tue, 5 Jun 2012 23:01:24 +0000 (16:01 -0700)]
am
03fcf943 : Download items should always fit screen.
* commit '
03fcf94300996a9cb7889ca03ddb2c62ca2ba606 ':
Download items should always fit screen.
Jeff Sharkey [Tue, 5 Jun 2012 20:23:16 +0000 (13:23 -0700)]
Download items should always fit screen.
Bug:
6614812
Change-Id: I9b5eb051bce1e296478fb1fa6f95b710fa0c819f
Eric Fischer [Fri, 25 May 2012 18:59:05 +0000 (11:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I952cc9c502b2896d4ec4e17fb184f93ad97ae1b4
The Android Open Source Project [Thu, 24 May 2012 16:08:25 +0000 (09:08 -0700)]
The Android Open Source Project [Thu, 24 May 2012 16:01:52 +0000 (09:01 -0700)]
Reconcile with jb-release
Change-Id: I5082e21795dab58054b3a6fea228ac6e0312be15
The Android Automerger [Thu, 24 May 2012 14:02:17 +0000 (07:02 -0700)]
merge in jb-release history after reset to jb-dev
Christian Robertson [Wed, 23 May 2012 21:09:34 +0000 (14:09 -0700)]
am
0cb81ea3 : am
f5ac95ff : Updating launcher icon to fix alignment. Bug:
6511716
* commit '
0cb81ea364ca9ac2c66e2ad2026d9b78bd792de5 ':
Updating launcher icon to fix alignment. Bug:
6511716
Christian Robertson [Wed, 23 May 2012 21:04:42 +0000 (14:04 -0700)]
am
f5ac95ff : Updating launcher icon to fix alignment. Bug:
6511716
* commit '
f5ac95ffef7897c83706eed9e419e6c015adaf75 ':
Updating launcher icon to fix alignment. Bug:
6511716
Christian Robertson [Wed, 23 May 2012 18:59:55 +0000 (11:59 -0700)]
Updating launcher icon to fix alignment. Bug:
6511716
Change-Id: I63fa8b85935aef453ea31730c3fc38127f0451f6
Jean-Baptiste Queru [Mon, 21 May 2012 21:32:45 +0000 (14:32 -0700)]
am
c1df0651 : am
0acd13fe : Merge "avoid repetition of retrying download"
* commit '
c1df0651e86ab6d0918cfac86ff54d3fb3781a69 ':
avoid repetition of retrying download
Jean-Baptiste Queru [Mon, 21 May 2012 20:47:09 +0000 (13:47 -0700)]
am
0acd13fe : Merge "avoid repetition of retrying download"
* commit '
0acd13fed2f4d0857ce89565fe94674c09b1e844 ':
avoid repetition of retrying download
Jean-Baptiste Queru [Mon, 21 May 2012 20:08:17 +0000 (13:08 -0700)]
Merge "avoid repetition of retrying download"
The Android Open Source Project [Wed, 16 May 2012 15:46:30 +0000 (08:46 -0700)]
am
3b696ab3 : Reconcile with jb-release nakasi-factoryrom-release
* commit '
3b696ab3c80388a4f1a413d39d536d2858b9f4e5 ':
The Android Open Source Project [Wed, 16 May 2012 15:41:11 +0000 (08:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ie7f0fac996068219e01f8560eff0156987e931fb
The Android Automerger [Fri, 4 May 2012 23:16:26 +0000 (16:16 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Sharkey [Fri, 4 May 2012 18:40:41 +0000 (11:40 -0700)]
am
3ea50965 : Merge "Updated layout for download items." into jb-dev
* commit '
3ea5096568f147941b4302070ffc2024bad8e18f ':
Updated layout for download items.
Jeff Sharkey [Fri, 4 May 2012 18:35:34 +0000 (11:35 -0700)]
Merge "Updated layout for download items." into jb-dev
Jeff Sharkey [Fri, 4 May 2012 01:08:24 +0000 (18:08 -0700)]
Updated layout for download items.
Switch to using GridLayout, because it's awesome. Also move status
display to right-hand side, showing date when in completed state.
Bug:
6378944
Change-Id: I540633010ed4aeeae299cedf7a49fdb81e65b431
Jeff Sharkey [Fri, 4 May 2012 18:21:17 +0000 (11:21 -0700)]
am
2f39d818 : Wrap share in chooser.
* commit '
2f39d81833807331c99d519f80b9eeb15ada4291 ':
Wrap share in chooser.
Jeff Sharkey [Fri, 4 May 2012 17:59:15 +0000 (10:59 -0700)]
Wrap share in chooser.
Bug:
5418990
Change-Id: I9e46844d3fc983afc3c389ec64c099374f955610
Eric Fischer [Mon, 30 Apr 2012 18:22:29 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ac17052609031b73a0711e20a34613acf15a4de
The Android Automerger [Wed, 25 Apr 2012 14:49:08 +0000 (07:49 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Sharkey [Tue, 24 Apr 2012 22:03:47 +0000 (15:03 -0700)]
Only delete spurious files belonging to us.
When multiple users are active, this can accidentally delete files
belonging to other users. Checking owner also helps us avoid
deleting recover and lost+found.
Bug:
6362988
Change-Id: Ifc165acc9a9b3ab253a4b6257f370836b98b3a74
The Android Automerger [Mon, 23 Apr 2012 14:06:15 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Jeff Sharkey [Fri, 20 Apr 2012 18:53:48 +0000 (11:53 -0700)]
Avoid NPE when _DATA column is empty.
Bug:
6371718
Change-Id: Id661210101b01daf8f5d46a318c32dbb9de9a4fb
Jeff Sharkey [Fri, 20 Apr 2012 03:51:24 +0000 (20:51 -0700)]
More slogging around download deletion.
Bug:
6362988
Change-Id: Iab4b86cfcaa6aeed6466f88ff49eb935f96db495
Jeff Sharkey [Thu, 19 Apr 2012 17:10:53 +0000 (10:10 -0700)]
Report MIME type for individual downloads.
Bug:
6358473
Change-Id: Ied4a6c8194d0cbb735e43cf7d7759f4674efe535
The Android Automerger [Thu, 19 Apr 2012 14:05:11 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
The Android Automerger [Wed, 18 Apr 2012 14:05:16 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
Jeff Sharkey [Tue, 17 Apr 2012 19:26:06 +0000 (12:26 -0700)]
Add and enforce ALLOW_METERED column.
Include flag with each download to indicate if its allowed to proceed
over metered networks. Downloads are left in WAITING_FOR_NETWORK
state, similar to how ALLOWED_NETWORK_TYPES is handled.
Also keep blocked downloads in WAITING_FOR_NETWORK state instead
of marking them as failed.
Bug:
3001465 ,
5734560
Change-Id: I80bb9aa9bd25ddf6f7a2472db344b6ba6878bd74
Jeff Sharkey [Mon, 16 Apr 2012 21:29:04 +0000 (14:29 -0700)]
View file downloads through DownloadsProvider.
When viewing file://-style downloads, open through DownloadsProvider
so that FLAG_GRANT_READ_URI_PERMISSION works. Add support for
OpenableColumns to support external apps probing for metadata.
Bug:
6343461
Change-Id: I630405406321ea1871c62cbcded55a4ee024ef6e
The Android Automerger [Mon, 16 Apr 2012 14:05:58 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
Jeff Sharkey [Fri, 13 Apr 2012 19:34:18 +0000 (12:34 -0700)]
Locking around downloads, and more dump info.
Bug:
4997552
Change-Id: I3c612acb5145a7638c9345a376a99958851a0891
The Android Automerger [Tue, 10 Apr 2012 14:06:58 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Jeff Sharkey [Fri, 6 Apr 2012 23:11:18 +0000 (16:11 -0700)]
Give DownloadManager a useful user agent.
Include platform version, model, and build, when available. Matches
current logic used by Browser.
Bug:
6257336
Change-Id: I0addfd944aff13bd4ce4226bb8d6328da6b0f5d5
The Android Automerger [Mon, 9 Apr 2012 14:06:47 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Jeff Sharkey [Thu, 5 Apr 2012 23:40:23 +0000 (16:40 -0700)]
Move to new NetworkPolicyManager accessor.
Change-Id: I21e5f6280748529bad881942f8f5534aa374ba55
The Android Automerger [Mon, 2 Apr 2012 14:06:43 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Jeff Sharkey [Thu, 29 Mar 2012 20:38:24 +0000 (13:38 -0700)]
Migrate to shared MockWebServer.
Bug:
4726601
Change-Id: Ibe537bd5c2a092dbf974360cd454751881f7f4ea
The Android Automerger [Wed, 28 Mar 2012 14:05:21 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Tue, 27 Mar 2012 18:09:36 +0000 (11:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: If1d8435e21fcfaf8d9d742f3077333fc1d45137f
The Android Automerger [Mon, 26 Mar 2012 14:07:07 +0000 (07:07 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Fri, 23 Mar 2012 18:36:38 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I472ad4749ceeaa967f4fd7ba2fdf2cfb5e97509a
Mike Lockwood [Wed, 21 Mar 2012 23:41:45 +0000 (16:41 -0700)]
Merge remote-tracking branch 'goog/ics-aah-exp'
empty -s ours merge
Change-Id: I6cfeced57f7c36e771b349f65a1a3e13e199890e
The Android Automerger [Mon, 12 Mar 2012 14:06:15 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Thu, 8 Mar 2012 19:14:18 +0000 (11:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4e78ced9628cd22fb59a17749f2ac9ce75ddbf73
The Android Automerger [Thu, 8 Mar 2012 15:05:21 +0000 (07:05 -0800)]
merge in jb-release history after reset to master
Eric Fischer [Wed, 7 Mar 2012 19:38:14 +0000 (11:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7df2d63cc2c51b79d98b4889687a8035453d125e
The Android Automerger [Wed, 7 Mar 2012 15:04:02 +0000 (07:04 -0800)]
merge in jb-release history after reset to master