OSDN Git Service
Craig Mautner [Thu, 2 Aug 2012 18:23:00 +0000 (11:23 -0700)]
Refactor DisplayManagerService to be functional.
Change-Id: Ieac1eca172be5dc5db45302d3afa26188acd4d6d
Scott Main [Thu, 2 Aug 2012 17:31:44 +0000 (10:31 -0700)]
am
80adeb53: am
5ae754c9: Merge "fix markup for gl pie" into jb-dev
* commit '
80adeb535f17331dedbbd200c99c366f34d33eeb':
fix markup for gl pie
Katie McCormick [Thu, 2 Aug 2012 17:31:36 +0000 (10:31 -0700)]
am
27ed953f: (-s ours) am
9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev
* commit '
27ed953f63f179b6be5a01425bf84df1dd934350':
cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Doc update: Misc minor GCM updates.
Craig Mautner [Thu, 2 Aug 2012 16:20:14 +0000 (09:20 -0700)]
Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev
Craig Mautner [Mon, 30 Jul 2012 19:10:24 +0000 (12:10 -0700)]
Introduce multiple displays with DisplayContent.
Fix a couple of bugs that turned up.
Remove touch/focus from display. Add iterators for access.
Respond to comments. Remove TODOs, and some deviceId parameters.
Change-Id: Idcdb4f1979aa7b14634d450fd0333d6eff26994d
Dianne Hackborn [Thu, 2 Aug 2012 02:05:52 +0000 (19:05 -0700)]
Merge "Add API to turn on HW drawing in IMEs." into jb-mr1-dev
Dianne Hackborn [Thu, 2 Aug 2012 02:00:38 +0000 (19:00 -0700)]
Add API to turn on HW drawing in IMEs.
Change-Id: Ib6a8bda46223ce1153f32834daf02a820d16136e
Jason Sams [Thu, 2 Aug 2012 01:37:36 +0000 (18:37 -0700)]
Merge "Vignette filter: precompute more values, simplify math, cleanup code" into jb-mr1-dev
Scott Main [Thu, 2 Aug 2012 00:04:58 +0000 (17:04 -0700)]
am
5ae754c9: Merge "fix markup for gl pie" into jb-dev
* commit '
5ae754c93a2c713f46e6cdbcab5ef051b5d0b600':
fix markup for gl pie
Scott Main [Wed, 1 Aug 2012 23:59:44 +0000 (16:59 -0700)]
Merge "fix markup for gl pie" into jb-dev
Katie McCormick [Wed, 1 Aug 2012 23:53:12 +0000 (16:53 -0700)]
am
9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev
* commit '
9f94208953fc8da72140c2964bcf12ff5b485784':
cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Doc update: Misc minor GCM updates.
Katie McCormick [Wed, 1 Aug 2012 23:49:37 +0000 (16:49 -0700)]
Merge changes I9bd42a8a,I613d0b12 into jb-dev
* changes:
cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Doc update: Misc minor GCM updates.
Wink Saville [Wed, 1 Aug 2012 23:43:36 +0000 (16:43 -0700)]
Merge "Unhide the new location API's" into jb-mr1-dev
Adam Powell [Wed, 1 Aug 2012 23:36:08 +0000 (16:36 -0700)]
Merge "Fix drawable handling for ActionBarContainer" into jb-mr1-dev
Katie McCormick [Wed, 1 Aug 2012 23:35:25 +0000 (16:35 -0700)]
am
1cfe4b40: am
9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev
* commit '
1cfe4b40d3cbf11695ffc70efa891559cff040b7':
Doc change: 4K -> 4kb
Adam Powell [Wed, 1 Aug 2012 23:31:23 +0000 (16:31 -0700)]
Fix drawable handling for ActionBarContainer
ActionBarContainer drawables for primary/stacked/split backgrounds
will now properly respect callbacks, layout direction, etc.
Bug
6905932
Change-Id: I20a089861c66a2a378f4b70c0b6cb4bb27476049
Scott Main [Wed, 1 Aug 2012 23:31:19 +0000 (16:31 -0700)]
fix markup for gl pie
Change-Id: I97b40b61f70ecd720f604ceca5849b066cf89988
Katie McCormick [Wed, 1 Aug 2012 23:24:25 +0000 (16:24 -0700)]
am
9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev
* commit '
9c311279726598de073314fb6059feea66957219':
Doc change: 4K -> 4kb
Katie McCormick [Wed, 1 Aug 2012 23:22:31 +0000 (16:22 -0700)]
am
510d8179: am
a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
* commit '
510d817977af6761274e700178a854b9f9160d9c':
cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
Katie McCormick [Wed, 1 Aug 2012 23:21:53 +0000 (16:21 -0700)]
Merge "Doc change: 4K -> 4kb" into jb-dev
Katie McCormick [Wed, 1 Aug 2012 23:16:22 +0000 (16:16 -0700)]
am
a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
* commit '
a5e150c95c6e7c38fc8643c3615f5664e2cd4582':
cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
Katie McCormick [Wed, 1 Aug 2012 23:14:47 +0000 (16:14 -0700)]
Doc change: 4K -> 4kb
Change-Id: Ic563436062c6bd17ba87f3b3cc4c765972b07289
Katie McCormick [Wed, 1 Aug 2012 23:13:35 +0000 (16:13 -0700)]
Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
Scott Main [Wed, 1 Aug 2012 23:09:29 +0000 (16:09 -0700)]
am
a9a3c25a: am
c9506415: Group revert of the following commits for design docs:
* commit '
a9a3c25a52e91346bb898e2d8c33f5c8fdd0295d':
Group revert of the following commits for design docs:
Scott Main [Wed, 1 Aug 2012 23:07:18 +0000 (16:07 -0700)]
am
c9506415: Group revert of the following commits for design docs:
* commit '
c9506415d533c61a9607c5b61a1993747bafb406':
Group revert of the following commits for design docs:
Katie McCormick [Fri, 27 Jul 2012 18:15:17 +0000 (11:15 -0700)]
cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
Change-Id: I6342d1a3925d43719358d905fc29f2628c6e92b4
Scott Main [Wed, 1 Aug 2012 22:51:29 +0000 (15:51 -0700)]
Rajeev Sharma [Wed, 1 Aug 2012 22:46:30 +0000 (15:46 -0700)]
Vignette filter: precompute more values, simplify math, cleanup code
Change-Id: I29cfc313a5173fd393944dd9af58d0111a3d726a
Ying Wang [Wed, 1 Aug 2012 22:29:17 +0000 (15:29 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Peter Ng [Wed, 1 Aug 2012 22:14:38 +0000 (15:14 -0700)]
am
7bf18315: am
2b1584c1: new confirming page and updates to progress and iconography
* commit '
7bf18315505090f45cbe91ad025e772c3ea7ebc4':
new confirming page and updates to progress and iconography
Peter Ng [Wed, 1 Aug 2012 22:12:26 +0000 (15:12 -0700)]
am
2b1584c1: new confirming page and updates to progress and iconography
* commit '
2b1584c1d53cd1070d5157c07158828b4baf8844':
new confirming page and updates to progress and iconography
Katie McCormick [Tue, 24 Jul 2012 22:05:28 +0000 (15:05 -0700)]
cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Conflicts:
docs/html/guide/google/gcm/gcm.jd
Change-Id: I9bd42a8a8842e26797ec4a6e7e45962b1560dc6a
Chris Wren [Wed, 1 Aug 2012 21:48:56 +0000 (14:48 -0700)]
am
790474ba: am
f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev
* commit '
790474ba3a2fb149090ced7d38247aed6f6a2d59':
Add missing docs to notification style rebuilder functions.
Scott Main [Wed, 1 Aug 2012 21:48:42 +0000 (14:48 -0700)]
am
c82875e4: am
e2594672: Merge "dashboard update for 8/1" into jb-dev
* commit '
c82875e4c1997f8d6d950a74e1353eb5b2c5ae19':
dashboard update for 8/1
Robert Greenwalt [Wed, 1 Aug 2012 21:48:34 +0000 (14:48 -0700)]
am
6b6ce6bf: am
a5637bac: Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName"
* commit '
6b6ce6bfce56c2f3ce007b33d3f834f8dd62b626':
Telephony: Add HSPAP to getTcpBufferSizesPropName
Jeff Sharkey [Wed, 1 Aug 2012 21:34:46 +0000 (14:34 -0700)]
Merge "Add trimToSize() to public API." into jb-mr1-dev
Jeff Sharkey [Sat, 28 Jul 2012 00:00:24 +0000 (17:00 -0700)]
Add trimToSize() to public API.
Bug:
6602490
Bug: http://code.google.com/p/android/issues/detail?id=35349
Change-Id: Ib3bc7fee05bb0edc375ebee1c40a1d7bd82e2a17
Teng-Hui Zhu [Wed, 1 Aug 2012 21:19:45 +0000 (14:19 -0700)]
Merge "Add license info to the HTML5Video files." into jb-mr1-dev
Teng-Hui Zhu [Wed, 1 Aug 2012 20:58:10 +0000 (13:58 -0700)]
Add license info to the HTML5Video files.
Change-Id: I44775bcdcc48d2c024b086098e140dae92f53339
Katie McCormick [Tue, 24 Jul 2012 22:05:28 +0000 (15:05 -0700)]
Doc update: Misc minor GCM updates.
Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Conflicts:
docs/html/guide/google/gcm/gcm.jd
Dianne Hackborn [Wed, 1 Aug 2012 20:39:45 +0000 (13:39 -0700)]
Merge "Start moving away from DisplayMetrics.DENSITY_DEVICE." into jb-mr1-dev
Peter Ng [Wed, 1 Aug 2012 01:13:21 +0000 (18:13 -0700)]
new confirming page and updates to progress and iconography
Change-Id: I060ac3c34cf268d77b46ac235a2726202a4bb222
Chris Wren [Wed, 1 Aug 2012 20:04:02 +0000 (13:04 -0700)]
am
f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev
* commit '
f11e0e7176489f5213acaa7e36c677882854cb8d':
Add missing docs to notification style rebuilder functions.
Irfan Sheriff [Wed, 1 Aug 2012 20:01:53 +0000 (13:01 -0700)]
Merge "Update statemachine for bssid change in supplicant" into jb-mr1-dev
Chris Wren [Wed, 1 Aug 2012 20:01:32 +0000 (13:01 -0700)]
Merge "Add missing docs to notification style rebuilder functions." into jb-dev
Scott Main [Wed, 1 Aug 2012 19:54:29 +0000 (12:54 -0700)]
am
e2594672: Merge "dashboard update for 8/1" into jb-dev
* commit '
e2594672d279234459aba308c093f444b04c5e91':
dashboard update for 8/1
Ying Wang [Wed, 1 Aug 2012 19:50:06 +0000 (12:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9800c2ea2bfd95bb615962f7b8e94dfc47a847ff
Auto-generated-cl: translation import
Scott Main [Wed, 1 Aug 2012 19:46:39 +0000 (12:46 -0700)]
Merge "dashboard update for 8/1" into jb-dev
Irfan Sheriff [Wed, 1 Aug 2012 16:32:05 +0000 (09:32 -0700)]
Update statemachine for bssid change in supplicant
We now use bssid instead of pending_bssid which was only valid in ASSOCIATING state.
This allows us to correctly update bssid during roaming.
Change-Id: Idffff329828196ecbfc5015882d3665c932cf1e6
Robert Greenwalt [Wed, 1 Aug 2012 19:14:33 +0000 (12:14 -0700)]
am
a5637bac: Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName"
* commit '
a5637bac23611a985696c92b49f93964f435ecb5':
Telephony: Add HSPAP to getTcpBufferSizesPropName
Chris Wren [Wed, 1 Aug 2012 17:56:56 +0000 (13:56 -0400)]
Add missing docs to notification style rebuilder functions.
Bug:
6914726
Change-Id: I13efae036610523ec6f83696d3337054e79856aa
Scott Main [Wed, 1 Aug 2012 18:20:38 +0000 (11:20 -0700)]
dashboard update for 8/1
Change-Id: I87e037c8128b4108ef94e18e7267304eb22083b9
Robert Greenwalt [Wed, 1 Aug 2012 18:01:21 +0000 (11:01 -0700)]
Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName"
Dianne Hackborn [Tue, 31 Jul 2012 23:37:34 +0000 (16:37 -0700)]
Start moving away from DisplayMetrics.DENSITY_DEVICE.
This puts in most of the infrastructure needed to allow us to
switch between different densities at run time. The main remaining
uses of the global are to initialize the Bitmap object (not sure
what to do about that since it doesn't have anything passed in
the constructor to get this information from), and being able to
load drawables if we need a different density than what was preloaded
by zygote.
Change-Id: Ifdbfd6b7a5c59e6aa22e63b95b78d96af3d96848
James Dong [Wed, 1 Aug 2012 17:33:28 +0000 (10:33 -0700)]
Merge "Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class" into jb-mr1-dev
Roman Nurik [Wed, 1 Aug 2012 17:06:49 +0000 (10:06 -0700)]
am
1d17f5a9: am
da5cb90b: Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev
* commit '
1d17f5a917a1abd5dd6eb100e5f791cacc65d524':
docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.
Scott Main [Wed, 1 Aug 2012 17:06:29 +0000 (10:06 -0700)]
am
bca68970: am
0d9d5831: Merge "fix more broken links" into jb-dev
* commit '
bca689703da6f64bfee05dd204149d0f40762344':
fix more broken links
Craig Mautner [Wed, 1 Aug 2012 17:04:38 +0000 (10:04 -0700)]
Merge "Remove debugging for
b6829431." into jb-mr1-dev
Roman Nurik [Wed, 1 Aug 2012 17:02:41 +0000 (10:02 -0700)]
am
da5cb90b: Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev
* commit '
da5cb90b992a28c0affe0d52b3b53c1a7b839eb2':
docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.
Scott Main [Wed, 1 Aug 2012 17:02:24 +0000 (10:02 -0700)]
am
0d9d5831: Merge "fix more broken links" into jb-dev
* commit '
0d9d583103aca82b6bc0be719b3579ee83760209':
fix more broken links
Craig Mautner [Wed, 1 Aug 2012 17:01:16 +0000 (10:01 -0700)]
Remove debugging for
b6829431.
Change-Id: If7da858722d5d0a5e7db2bc249d454bdee1ec94e
Roman Nurik [Wed, 1 Aug 2012 16:59:53 +0000 (09:59 -0700)]
Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev
Scott Main [Wed, 1 Aug 2012 16:58:52 +0000 (09:58 -0700)]
Merge "fix more broken links" into jb-dev
Roman Nurik [Tue, 31 Jul 2012 21:08:59 +0000 (14:08 -0700)]
docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.
Most of this code is adapted from my code.google.com/p/android-ui-utils
project.
Change-Id: If6763bc7a490e53bd31d5a713158577fa74cfd7b
Peter Ng [Wed, 1 Aug 2012 15:59:37 +0000 (08:59 -0700)]
am
31737eaa: am
a8666422: Merge "moving accessibility image to callouts" into jb-dev
* commit '
31737eaa39bd0ef21a3cdc5470bbf124c70a6948':
moving accessibility image to callouts
Peter Ng [Wed, 1 Aug 2012 15:59:33 +0000 (08:59 -0700)]
am
edd7873c: am
c2eb7080: Merge "new extras section linking to design talks" into jb-dev
* commit '
edd7873c3475b871b6496e854e369c8f15c7e9a1':
new extras section linking to design talks
Peter Ng [Wed, 1 Aug 2012 15:51:53 +0000 (08:51 -0700)]
am
a8666422: Merge "moving accessibility image to callouts" into jb-dev
* commit '
a86664223612ba8bfaded5a2ae2178b6482d9fd5':
moving accessibility image to callouts
Peter Ng [Wed, 1 Aug 2012 15:51:42 +0000 (08:51 -0700)]
am
c2eb7080: Merge "new extras section linking to design talks" into jb-dev
* commit '
c2eb7080481096777660aa726d46c2ccf21aca0d':
new extras section linking to design talks
Raph Levien [Wed, 1 Aug 2012 02:26:54 +0000 (19:26 -0700)]
Merge "Fix bug
6892600 Font (character pairs) rendering issue" into jb-mr1-dev
Romain Guy [Wed, 1 Aug 2012 01:55:43 +0000 (18:55 -0700)]
Merge "Improve gradients" into jb-mr1-dev
Romain Guy [Mon, 30 Jul 2012 21:47:51 +0000 (14:47 -0700)]
Improve gradients
Avoid using textures for common gradients (two stops from 0.0 to 1.0)
Change-Id: Iff55d21b126c8cfc4cfb701669f2339c8f6b131a
Scott Main [Wed, 1 Aug 2012 01:25:33 +0000 (18:25 -0700)]
fix more broken links
Change-Id: If4dceab223a6c22827a0645aa5923ddc427b2b85
Dianne Hackborn [Wed, 1 Aug 2012 01:24:25 +0000 (18:24 -0700)]
Merge "Optimize memory use of IntentResolver." into jb-mr1-dev
Dianne Hackborn [Wed, 1 Aug 2012 01:11:03 +0000 (18:11 -0700)]
Merge "Make AtomicFile a public API. It's about time!" into jb-mr1-dev
Dianne Hackborn [Wed, 1 Aug 2012 00:54:35 +0000 (17:54 -0700)]
Make AtomicFile a public API. It's about time!
Change-Id: Ib34e294747405b7ab709cb0bbb2d9a0cc80ce86a
Jeff Sharkey [Wed, 1 Aug 2012 00:11:07 +0000 (17:11 -0700)]
Revert "API to adjust network stats."
Adam Powell [Tue, 31 Jul 2012 23:41:37 +0000 (16:41 -0700)]
Merge "Don't let ScrollView intercept touch events if it can't scroll." into jb-mr1-dev
Adam Powell [Tue, 31 Jul 2012 23:39:32 +0000 (16:39 -0700)]
Don't let ScrollView intercept touch events if it can't scroll.
Bug
6872104
Change-Id: Iee643e052acc37485a8ec45b7af8be0783fb1a95
Peter Ng [Tue, 31 Jul 2012 23:08:32 +0000 (16:08 -0700)]
Merge "moving accessibility image to callouts" into jb-dev
Peter Ng [Tue, 31 Jul 2012 21:58:51 +0000 (14:58 -0700)]
moving accessibility image to callouts
Change-Id: Ia67240a5eced57803d4593269a509b28fe2ecf9c
Peter Ng [Tue, 31 Jul 2012 23:01:13 +0000 (16:01 -0700)]
Merge "new extras section linking to design talks" into jb-dev
Peter Ng [Tue, 31 Jul 2012 17:16:28 +0000 (10:16 -0700)]
new extras section linking to design talks
Change-Id: Ia16fb1a90f4f8e3d42dea978e17cea0ed6cd107e
Jason Sams [Tue, 31 Jul 2012 22:30:28 +0000 (15:30 -0700)]
Merge "save 2ms replace div with mul." into jb-mr1-dev
Scott Main [Tue, 31 Jul 2012 21:59:53 +0000 (14:59 -0700)]
am
ba751a0a: am
f284d492: docs: fix broken links
* commit '
ba751a0adef55059a2ff6d64903d97309983c536':
docs: fix broken links
Scott Main [Tue, 31 Jul 2012 21:57:37 +0000 (14:57 -0700)]
am
f284d492: docs: fix broken links
* commit '
f284d49293aead609de5b83d601260cfd86b7978':
docs: fix broken links
The Android Open Source Project [Tue, 31 Jul 2012 21:51:16 +0000 (14:51 -0700)]
am
ca4117ca: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
ca4117ca387fbcd8a9e18070e0a73c2eae4baa22':
James Dong [Tue, 31 Jul 2012 19:19:38 +0000 (12:19 -0700)]
Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class
o related-to-bug:
6872687
Change-Id: I94569bb8357c39e8309974ede8284b33a996866c
The Android Open Source Project [Tue, 31 Jul 2012 21:48:19 +0000 (14:48 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Ica8b95c440b5c3fe0a7d31e9633d4ac1b0e02c38
Scott Main [Tue, 31 Jul 2012 16:46:52 +0000 (09:46 -0700)]
docs: fix broken links
Change-Id: I0523fb8eb8608b07cf7ca866d0c2ccfcbfc2e946
The Android Automerger [Tue, 31 Jul 2012 21:07:31 +0000 (14:07 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Kenny Root [Tue, 31 Jul 2012 19:36:35 +0000 (12:36 -0700)]
am
194da0b8: am
a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev
* commit '
194da0b8b368ac61b23870224bc0d449ad465bd4':
Fix AccountManagerServiceTest
Kenny Root [Tue, 31 Jul 2012 19:34:30 +0000 (12:34 -0700)]
am
a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev
* commit '
a39fdd11e80618acc046fff65b6549b5c8b5aa8d':
Fix AccountManagerServiceTest
Kenny Root [Tue, 31 Jul 2012 19:32:26 +0000 (12:32 -0700)]
Merge "Fix AccountManagerServiceTest" into jb-dev
Kenny Root [Tue, 31 Jul 2012 19:27:30 +0000 (12:27 -0700)]
Fix AccountManagerServiceTest
The MockAccountAuthenticatorCache needs to implement the new method.
Bug:
6820670
Change-Id: I5d1cb3aecec63602ae4541cd01ae8e28c8328e5a
Fabrice Di Meglio [Tue, 31 Jul 2012 19:26:51 +0000 (12:26 -0700)]
Merge "Improve Toast RTL support" into jb-mr1-dev
Jeff Sharkey [Tue, 31 Jul 2012 19:09:54 +0000 (12:09 -0700)]
Merge "API to adjust network stats. DO NOT MERGE." into jb-mr1-dev
Jeff Sharkey [Sat, 28 Jul 2012 00:35:32 +0000 (17:35 -0700)]
API to adjust network stats. DO NOT MERGE.
Enables system apps to correctly account network usage performed on
behalf of another application.
Bug:
6695246
Change-Id: I39e243afd57936b6b30157a6ca511a17b6c55c39
Alexander Lucas [Tue, 31 Jul 2012 18:45:05 +0000 (11:45 -0700)]
am
cef72019: am
320b3ec2: Merge "Initial commit of wireless connectivity/discovery class." into jb-dev
* commit '
cef720192aa615a08b36e282b8ae24197131f18b':
Initial commit of wireless connectivity/discovery class.
Alexander Lucas [Tue, 31 Jul 2012 18:42:59 +0000 (11:42 -0700)]
am
320b3ec2: Merge "Initial commit of wireless connectivity/discovery class." into jb-dev
* commit '
320b3ec21eff971827a9032f1fb1ee7c866e4303':
Initial commit of wireless connectivity/discovery class.
Alexander Lucas [Tue, 31 Jul 2012 18:39:53 +0000 (11:39 -0700)]
Merge "Initial commit of wireless connectivity/discovery class." into jb-dev
OSDN Git Service
