OSDN Git Service
John Spurlock [Sat, 15 Jun 2013 13:01:43 +0000 (13:01 +0000)]
Merge "Remove unused CloseDragHandle."
John Spurlock [Sat, 15 Jun 2013 13:00:45 +0000 (13:00 +0000)]
Merge "Remove unused CarrierLabel."
John Spurlock [Sat, 15 Jun 2013 13:00:07 +0000 (13:00 +0000)]
Merge "Remove unused VolumeController."
John Spurlock [Sat, 15 Jun 2013 12:58:59 +0000 (12:58 +0000)]
Merge "Remove unused FixedSizeDrawable."
John Spurlock [Sat, 15 Jun 2013 12:58:00 +0000 (12:58 +0000)]
Merge "Remove unused EventHole."
John Spurlock [Sat, 15 Jun 2013 12:57:16 +0000 (12:57 +0000)]
Merge "Remove unused do-not-disturb items."
John Spurlock [Sat, 15 Jun 2013 12:56:26 +0000 (12:56 +0000)]
Merge "Stabilize hideybar confirmation toast."
Dianne Hackborn [Sat, 15 Jun 2013 00:39:30 +0000 (00:39 +0000)]
Merge "More work on process tracking."
Chong Zhang [Sat, 15 Jun 2013 00:36:15 +0000 (00:36 +0000)]
Merge "MediaRouter: grey out wifi displays that's in use"
Dianne Hackborn [Fri, 14 Jun 2013 02:06:50 +0000 (19:06 -0700)]
More work on process tracking.
Re-arranged code to be more flexible, now track
state of services, dump ordered list of running
processes while memory was critical and low.
Also rename battery stats service from "batteryinfo" to "batterystats".
Change-Id: I0f4f0c8d443c49d255cb84d0fc917e8ec18b152e
Scott Main [Sat, 15 Jun 2013 00:11:53 +0000 (17:11 -0700)]
am
3717cf6b: am
07d6d9e7: Merge "additional documentation for media codec info" into jb-mr2-dev
* commit '
3717cf6bc2e92d58d8de9f039165d1e6c73de8a0':
additional documentation for media codec info
Scott Main [Sat, 15 Jun 2013 00:08:33 +0000 (17:08 -0700)]
am
07d6d9e7: Merge "additional documentation for media codec info" into jb-mr2-dev
* commit '
07d6d9e74c1f79de791b37b1cb738fa398915879':
additional documentation for media codec info
Scott Main [Sat, 15 Jun 2013 00:04:50 +0000 (00:04 +0000)]
Merge "additional documentation for media codec info" into jb-mr2-dev
Romain Guy [Fri, 14 Jun 2013 23:54:05 +0000 (23:54 +0000)]
Merge "Merge more 9patches"
Romain Guy [Fri, 14 Jun 2013 23:31:37 +0000 (16:31 -0700)]
Merge more 9patches
Change-Id: If8b16af84f0ee42afc406922d15897e51d833e68
Elliott Hughes [Fri, 14 Jun 2013 23:27:37 +0000 (16:27 -0700)]
am
96fefaa2: am
b87e6138: am
618ed234: Merge "Track nio API change."
* commit '
96fefaa23bf95ae6736df90f018cb8c86cb943c3':
Track nio API change.
Jeff Sharkey [Fri, 14 Jun 2013 23:26:58 +0000 (23:26 +0000)]
Merge "Cache AndroidBlockGuardPolicy to avoid allocation."
Elliott Hughes [Fri, 14 Jun 2013 23:25:00 +0000 (16:25 -0700)]
am
b87e6138: am
618ed234: Merge "Track nio API change."
* commit '
b87e6138d169e5fd23b964056431e2c357323fd2':
Track nio API change.
Elliott Hughes [Fri, 14 Jun 2013 23:22:12 +0000 (16:22 -0700)]
am
618ed234: Merge "Track nio API change."
* commit '
618ed2340283263164f578f818cc09148aacb9ed':
Track nio API change.
Elliott Hughes [Fri, 14 Jun 2013 23:18:35 +0000 (23:18 +0000)]
Merge "Track nio API change."
Jeff Sharkey [Fri, 14 Jun 2013 21:43:18 +0000 (14:43 -0700)]
Cache AndroidBlockGuardPolicy to avoid allocation.
Every incoming Binder call ends up triggering a BlockGuardPolicy
update, which would thrash between new AndroidBlockGuardPolicy
instances and BlockGuard.LAX_POLICY, causing GC churn.
This change avoids the extra allocations by recycling a single
AndroidBlockGuardPolicy in a ThreadLocal. Worst-case thrashing case
is now 10% faster; from 7.46us to 6.65us.
Bug:
9424568
Change-Id: I9c3b1c097a2aecc9b1f109a824cf3ea319fb3393
Elliott Hughes [Fri, 14 Jun 2013 22:41:26 +0000 (15:41 -0700)]
Track nio API change.
Change-Id: I6a6d6c9e5f658b66dca0db226d2d91ee5f8ab2c7
John Spurlock [Fri, 14 Jun 2013 20:47:05 +0000 (16:47 -0400)]
Remove unused CloseDragHandle.
Change-Id: Ic7fc0eacc4534db99a39ea8112339ee4a4af57c4
John Spurlock [Fri, 14 Jun 2013 20:41:24 +0000 (16:41 -0400)]
Remove unused CarrierLabel.
Change-Id: I145a7ee38655a957aec14fe7318092c42b3cb6cc
Daniel Sandler [Fri, 14 Jun 2013 20:36:56 +0000 (13:36 -0700)]
am
5be52fb5: am
a0c9b9d2: Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev
* commit '
5be52fb5ae462b83b0619b95e7991e52bc2031b2':
Temporarily restore some support for icon==0 notifications.
Daniel Sandler [Fri, 14 Jun 2013 20:34:55 +0000 (13:34 -0700)]
am
a0c9b9d2: Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev
* commit '
a0c9b9d2a7a0566615b6b044ac8a6b434c80d5be':
Temporarily restore some support for icon==0 notifications.
John Spurlock [Fri, 14 Jun 2013 20:31:48 +0000 (16:31 -0400)]
Remove unused VolumeController.
Change-Id: I23279c9c2f152bd9182487ce30da14078d108ff7
Daniel Sandler [Fri, 14 Jun 2013 20:29:23 +0000 (20:29 +0000)]
Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev
John Spurlock [Fri, 14 Jun 2013 20:22:46 +0000 (16:22 -0400)]
Remove unused FixedSizeDrawable.
Change-Id: Ia6bad570359d3cce4e57c0a32d181bd156d89d6c
John Spurlock [Fri, 14 Jun 2013 20:16:43 +0000 (16:16 -0400)]
Remove unused EventHole.
Change-Id: Ia83bb72c93561bdfa4d767bd78fe0dff60f5de5b
John Spurlock [Fri, 14 Jun 2013 20:09:57 +0000 (16:09 -0400)]
Remove unused do-not-disturb items.
Change-Id: I3dd3e242a8a1db0148e3ff4386ff812a4cca66bc
John Spurlock [Fri, 14 Jun 2013 19:55:17 +0000 (19:55 +0000)]
Merge "Remove unused status_bar_icon.xml"
John Spurlock [Fri, 14 Jun 2013 19:40:51 +0000 (15:40 -0400)]
Remove unused status_bar_icon.xml
Change-Id: I9d665203712d4865f5aa788600c89fbc876b14dd
Scott Main [Wed, 12 Jun 2013 19:56:05 +0000 (12:56 -0700)]
additional documentation for media codec info
Change-Id: I3b4e5baccab6da2dfc8dff8d03872bb5b346a4ad
Scott Main [Fri, 14 Jun 2013 18:08:34 +0000 (11:08 -0700)]
am
478471b5: am
3b0205b7: am
0b3fe078: am
a17201a8: am
7190a059: fix transition from download to install instructions
* commit '
478471b579c221d371b3227abd02cb24eff995e1':
fix transition from download to install instructions
Scott Main [Fri, 14 Jun 2013 18:07:21 +0000 (11:07 -0700)]
am
3b0205b7: am
0b3fe078: am
a17201a8: am
7190a059: fix transition from download to install instructions
* commit '
3b0205b7601a6fa3d7abf6dbc5a60223981103cc':
fix transition from download to install instructions
John Spurlock [Fri, 14 Jun 2013 17:59:31 +0000 (13:59 -0400)]
Stabilize hideybar confirmation toast.
Remove gravity workaround no longer needed after recent window
manager layout fix.
Also migrate instable code-based toast text calculation to use
the resource system properly.
Change-Id: Ifa380e387389ed9917336ad19dfde49f67a5fb10
Scott Main [Fri, 14 Jun 2013 18:02:41 +0000 (11:02 -0700)]
am
0b3fe078: am
a17201a8: am
7190a059: fix transition from download to install instructions
* commit '
0b3fe0785c0c6ff0ce834c06b6828f884a658730':
fix transition from download to install instructions
Scott Main [Fri, 14 Jun 2013 17:56:28 +0000 (10:56 -0700)]
am
a17201a8: am
7190a059: fix transition from download to install instructions
* commit '
a17201a81691ac337426923d1bdcf9e0a26b841e':
fix transition from download to install instructions
Scott Main [Fri, 14 Jun 2013 17:53:45 +0000 (10:53 -0700)]
am
7190a059: fix transition from download to install instructions
* commit '
7190a05951efa4f5cf94bb22da48dce85c52bd06':
fix transition from download to install instructions
Scott Main [Fri, 14 Jun 2013 17:49:55 +0000 (10:49 -0700)]
fix transition from download to install instructions
Change-Id: Ibb06779891ffab2c213b7c3401293e6fb7a6c4c9
John Spurlock [Fri, 14 Jun 2013 17:50:50 +0000 (17:50 +0000)]
Merge "Remove concept of system bar from window manager."
Scott Main [Fri, 14 Jun 2013 17:28:00 +0000 (10:28 -0700)]
am
0be889dd: am
6e594289: am
d2ad6dc5: am
6af13a74: am
ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
* commit '
0be889dd0e5605fa0abc04ebdd732a297de6ab27':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
Scott Main [Fri, 14 Jun 2013 17:25:38 +0000 (10:25 -0700)]
am
6e594289: am
d2ad6dc5: am
6af13a74: am
ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
* commit '
6e5942894a40ed2a199f25bf4e8a215c95d2c79b':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
John Spurlock [Thu, 13 Jun 2013 15:10:51 +0000 (11:10 -0400)]
Remove concept of system bar from window manager.
It was already hardcoded to false, this change removes the dead code.
Change-Id: I5e543344e60f69cb9882a70ba29f7c09404ad9fc
Scott Main [Fri, 14 Jun 2013 17:16:02 +0000 (10:16 -0700)]
am
d2ad6dc5: am
6af13a74: am
ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
* commit '
d2ad6dc5304e5c3a4f0dc1bd04f7ab713ed66c6d':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
Scott Main [Fri, 14 Jun 2013 17:12:30 +0000 (10:12 -0700)]
am
6af13a74: am
ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
* commit '
6af13a74d3dcf56187edf153e0341221faf9f1ad':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
Scott Main [Fri, 14 Jun 2013 17:09:12 +0000 (10:09 -0700)]
am
ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
* commit '
ec025db4a74914640c42412c63413f2d5d46e45d':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
Marco Nelissen [Fri, 14 Jun 2013 16:49:18 +0000 (16:49 +0000)]
Merge "Make MediaPlayer.invoke() public-and-hidden again"
Marco Nelissen [Fri, 14 Jun 2013 16:42:26 +0000 (09:42 -0700)]
Make MediaPlayer.invoke() public-and-hidden again
It's used in a bunch of other places in other repos that I don't
want to touch.
Change-Id: I6f2ec6f8066286de9b52499fc71f3f08953c3cb4
Dirk Dougherty [Fri, 14 Jun 2013 16:31:51 +0000 (09:31 -0700)]
am
b5de95d1: am
f1d2c5ae: Merge "Doc change: diffs for API 18" into jb-mr2-dev
* commit '
b5de95d1f8e17836098229f675bf5d53a8327757':
Doc change: diffs for API 18
Dirk Dougherty [Fri, 14 Jun 2013 16:29:50 +0000 (09:29 -0700)]
am
f1d2c5ae: Merge "Doc change: diffs for API 18" into jb-mr2-dev
* commit '
f1d2c5aeb23739bde3708f4e4d4bdb99f059f1ed':
Doc change: diffs for API 18
Dirk Dougherty [Fri, 14 Jun 2013 16:23:11 +0000 (16:23 +0000)]
Merge "Doc change: diffs for API 18" into jb-mr2-dev
Marco Nelissen [Fri, 14 Jun 2013 16:19:29 +0000 (16:19 +0000)]
Merge "Forgot something"
Marco Nelissen [Fri, 14 Jun 2013 16:18:35 +0000 (09:18 -0700)]
Forgot something
Change-Id: Ia579213303e79b282a7ba472b39576d4b160a739
Marco Nelissen [Fri, 14 Jun 2013 16:15:47 +0000 (16:15 +0000)]
Merge "Fix build"
Marco Nelissen [Fri, 14 Jun 2013 16:14:28 +0000 (09:14 -0700)]
Fix build
We don't need a separate test for invoke() because there are other
tests that exercise it.
Change-Id: I8c8f3593e7e9eed3c53997453f0f66ba8374e79e
Scott Main [Fri, 14 Jun 2013 16:11:41 +0000 (09:11 -0700)]
am
695be87d: am
92053f8b: revise docs for new sensor types. fix markup error causing tons of code font
* commit '
695be87d6e87fada03b548d05f82e004d0cdb240':
revise docs for new sensor types. fix markup error causing tons of code font
Scott Main [Fri, 14 Jun 2013 15:45:20 +0000 (08:45 -0700)]
am
92053f8b: revise docs for new sensor types. fix markup error causing tons of code font
* commit '
92053f8b28ce0d035d292fa73622200990682511':
revise docs for new sensor types. fix markup error causing tons of code font
Marco Nelissen [Fri, 14 Jun 2013 15:00:43 +0000 (15:00 +0000)]
Merge "Remove unused MediaPlayer methods"
Chong Zhang [Tue, 11 Jun 2013 17:25:49 +0000 (10:25 -0700)]
MediaRouter: grey out wifi displays that's in use
bug
9229799
Change-Id: I9f5fd2107f60c492d42c74e575e6483838a51267
Adam Powell [Fri, 14 Jun 2013 01:28:25 +0000 (01:28 +0000)]
Merge "Don't save ScrollView/HorizontalScrollView saved state for old apps"
Chris Craik [Fri, 14 Jun 2013 01:06:29 +0000 (01:06 +0000)]
Merge "Fix various draw ops that may incorrectly not scissor"
Adam Powell [Fri, 14 Jun 2013 00:44:04 +0000 (17:44 -0700)]
Don't save ScrollView/HorizontalScrollView saved state for old apps
Older apps may have given IDs to ScrollViews and views of a different
class in layouts that vary by configuration. Now that ScrollViews save
state this causes ClassCastExceptions when trying to restore instance
state.
Only save new instance state for ScrollView/HorizontalScrollView for
apps targeting post-API 18.
Change-Id: Icaa095cd20bef35dddc225a17c5a8e30b3faea02
Scott Main [Thu, 13 Jun 2013 23:32:50 +0000 (16:32 -0700)]
revise docs for new sensor types. fix markup error causing tons of code font
Change-Id: I7635bbc44e03b50faeddf5c5fe50f7f47e2cde35
Dirk Dougherty [Thu, 13 Jun 2013 23:33:04 +0000 (16:33 -0700)]
Doc change: diffs for API 18
Change-Id: I92d9880959e18bb0cffa68a05a042de6d5790aa4
Geremy Condra [Thu, 13 Jun 2013 23:30:49 +0000 (23:30 +0000)]
Merge "Add NetworkManagement methods for netd uid binds"
Chris Craik [Thu, 13 Jun 2013 21:39:01 +0000 (14:39 -0700)]
Fix various draw ops that may incorrectly not scissor
bug:
8965976
Also consolidates quickReject scissor-ing and scissor-less paths.
Renamed plain 'quickReject' method, as it has sideEffects beyond what
the java and skia canvases do.
Change-Id: I4bdf874d3c8f469d283eae1e71c5e7ea53d47016
Alan Viverette [Thu, 13 Jun 2013 23:03:03 +0000 (23:03 +0000)]
Merge "Postpone creating new drawables for DrawableContainerState."
Romain Guy [Thu, 13 Jun 2013 22:27:25 +0000 (22:27 +0000)]
Merge "Fix possible NPE when a ViewRoot doesn't have a view"
Romain Guy [Thu, 13 Jun 2013 22:26:50 +0000 (15:26 -0700)]
Fix possible NPE when a ViewRoot doesn't have a view
Change-Id: I8f76a657fa44fc5c7e0bec3e609eaf49e269910f
Marco Nelissen [Thu, 13 Jun 2013 22:25:25 +0000 (15:25 -0700)]
Remove unused MediaPlayer methods
Change-Id: Id63fdde7d0e4f096d3bb9eb4da5e0f37eb9dea21
Alan Viverette [Thu, 13 Jun 2013 22:11:16 +0000 (15:11 -0700)]
Postpone creating new drawables for DrawableContainerState.
When creating a DrawableContainerState from a constant state, calls to
ConstantState.newDrawable() are postponed and made as they are needed.
Bug:
9280861
Change-Id: I03c93a43ee00aca3ff618d66d7f507f1722538d1
Romain Guy [Thu, 13 Jun 2013 22:10:21 +0000 (22:10 +0000)]
Merge "Add new Query class for debugging"
Scott Main [Thu, 13 Jun 2013 22:00:43 +0000 (15:00 -0700)]
change studio version number to use 'x' for final decimal.
also go to install guide after download begins
Change-Id: I9ec266b20585c00cf5a643fede2df64eb2066ebc
Romain Guy [Thu, 13 Jun 2013 21:29:40 +0000 (14:29 -0700)]
Add new Query class for debugging
This class can be used to perform occlusion queries. An occlusion query
can be used to test whether an object is entirely hidden or not.
Change-Id: Ida456df81dbe008a64d3ff4cb7879340785c6abf
Scott Main [Thu, 13 Jun 2013 21:58:16 +0000 (14:58 -0700)]
am
11caa0b6: am
f52532de: am
cb2a8505: am
695896a4: am
46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
* commit '
11caa0b6d9202e27e24daf6cef030ec9599f7af4':
add ninepatch search tag
Scott Main [Thu, 13 Jun 2013 21:56:03 +0000 (14:56 -0700)]
am
f52532de: am
cb2a8505: am
695896a4: am
46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
* commit '
f52532de2a3da2f41ddc28e25d2883d45f189018':
add ninepatch search tag
Scott Main [Thu, 13 Jun 2013 21:54:48 +0000 (14:54 -0700)]
am
cb2a8505: am
695896a4: am
46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
* commit '
cb2a85058e24ecd35349b5470e402bcb52df2d6b':
add ninepatch search tag
Scott Main [Thu, 13 Jun 2013 21:51:47 +0000 (14:51 -0700)]
am
695896a4: am
46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
* commit '
695896a46578e7ad4e540151e799a9f0b8828ad1':
add ninepatch search tag
Scott Main [Thu, 13 Jun 2013 21:49:20 +0000 (14:49 -0700)]
am
46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
* commit '
46c8931ffc78f5204b34f7ba5098defbc318b7a4':
add ninepatch search tag
Scott Main [Thu, 13 Jun 2013 21:47:27 +0000 (21:47 +0000)]
Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
Alan Viverette [Thu, 13 Jun 2013 20:32:20 +0000 (20:32 +0000)]
Merge "Ensure page up/down always moves to first/last selectable item."
Alan Viverette [Thu, 13 Jun 2013 20:27:59 +0000 (13:27 -0700)]
Ensure page up/down always moves to first/last selectable item.
Bug:
5088505
Change-Id: Ie73705f46602003b1c02fa08427dc940ad9f9b8a
Adam Powell [Thu, 13 Jun 2013 20:25:31 +0000 (20:25 +0000)]
Merge "Show the default activity icon in the action bar if one is not supplied"
Adam Powell [Thu, 13 Jun 2013 20:15:43 +0000 (13:15 -0700)]
Show the default activity icon in the action bar if one is not supplied
Fix a regression where the system default activity icon was not used
in the action bar if neither the activity nor application supplied
one.
Bug
9409846
Change-Id: I80a95a0bee511f21cd326372edaf6af811272825
buzbee [Thu, 13 Jun 2013 19:57:25 +0000 (19:57 +0000)]
Merge "Process new system property for max JIT cache size"
Chris Craik [Thu, 13 Jun 2013 19:24:17 +0000 (19:24 +0000)]
Merge "Reset batching state when overlap batch deletion occurs"
Jeff Sharkey [Thu, 13 Jun 2013 18:55:21 +0000 (18:55 +0000)]
Merge "Protect more system broadcasts."
Chris Craik [Thu, 13 Jun 2013 18:21:22 +0000 (11:21 -0700)]
Reset batching state when overlap batch deletion occurs
Change-Id: Ifdbee9baaa734e27d15d2b54aa3b3abfffbce1e9
Dianne Hackborn [Thu, 13 Jun 2013 17:41:06 +0000 (17:41 +0000)]
Merge "Fix some things."
The Android Open Source Project [Thu, 13 Jun 2013 15:25:36 +0000 (08:25 -0700)]
am
026cba6c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
026cba6c66677b6eb8ad6ac260dfd1bece07362d':
Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
Fix logspam when battery sysfs file not available.
The Android Open Source Project [Thu, 13 Jun 2013 15:22:44 +0000 (08:22 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Ic69db23c3b1ba493a97b162caa664759cf3b1bda
John Spurlock [Thu, 13 Jun 2013 13:54:43 +0000 (13:54 +0000)]
Merge "Remove TabletStatusBar from systemui package."
Craig Mautner [Thu, 13 Jun 2013 13:53:27 +0000 (13:53 +0000)]
Merge "Add debug for specific bug."
The Android Automerger [Thu, 13 Jun 2013 12:55:24 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Narayan Kamath [Thu, 13 Jun 2013 09:34:23 +0000 (02:34 -0700)]
am
7d1fd557: am
372d21ad: am
6706ca96: Merge "Update HttpResponseCache to use the new cache API."
* commit '
7d1fd557a3fd96365565531e5e45ac5e93dd8315':
Update HttpResponseCache to use the new cache API.
Narayan Kamath [Thu, 13 Jun 2013 09:31:51 +0000 (02:31 -0700)]
am
372d21ad: am
6706ca96: Merge "Update HttpResponseCache to use the new cache API."
* commit '
372d21ad69a43e3d0a26b23f45351511ed88e9e6':
Update HttpResponseCache to use the new cache API.
Narayan Kamath [Thu, 13 Jun 2013 09:29:11 +0000 (02:29 -0700)]
am
6706ca96: Merge "Update HttpResponseCache to use the new cache API."
* commit '
6706ca96b21ebbd620fb597a23e8180f76bb37cf':
Update HttpResponseCache to use the new cache API.
Narayan Kamath [Thu, 13 Jun 2013 09:26:33 +0000 (09:26 +0000)]
Merge "Update HttpResponseCache to use the new cache API."