OSDN Git Service
Elliott Hughes [Thu, 4 Nov 2010 20:47:13 +0000 (13:47 -0700)]
Merge "Fix an off-by-one error."
Jason Sams [Thu, 4 Nov 2010 20:33:19 +0000 (13:33 -0700)]
Merge "Fix potental incremental build failure with leftover RS generated files."
Mike Lockwood [Thu, 4 Nov 2010 19:40:26 +0000 (12:40 -0700)]
Merge "MediaStore: Make definitions for Files table public"
Dianne Hackborn [Thu, 4 Nov 2010 19:21:48 +0000 (12:21 -0700)]
Merge "StrictMode: now in more system server threads."
Romain Guy [Thu, 4 Nov 2010 19:14:37 +0000 (12:14 -0700)]
Merge "Fix possible rendering issue when drawing a path."
Kenny Root [Thu, 4 Nov 2010 18:50:51 +0000 (11:50 -0700)]
Merge "Add "nodpi" to DpiTest Android.mk"
Jamie Gennis [Thu, 4 Nov 2010 18:18:14 +0000 (11:18 -0700)]
Merge "Fix a MediaBuffer leak in Stagefright."
Leon Scroggins [Thu, 4 Nov 2010 18:11:42 +0000 (11:11 -0700)]
Merge "Use the new web email and password variations."
Xavier Ducrohet [Thu, 4 Nov 2010 18:03:45 +0000 (11:03 -0700)]
Merge "Layoutlib native delegate: FloatMath."
Xavier Ducrohet [Thu, 4 Nov 2010 18:03:39 +0000 (11:03 -0700)]
Merge "Layoutlib native delegate: path effects and xfermode."
Scott Main [Thu, 4 Nov 2010 17:57:48 +0000 (10:57 -0700)]
am
13259f0b: am
17c87d80: Merge "docs: more revisions to the installing docs for GB" into gingerbread
* commit '
13259f0ba08cde334a9b6760b20f14c269893652':
docs: more revisions to the installing docs for GB
Jean-Baptiste Queru [Thu, 4 Nov 2010 17:57:34 +0000 (10:57 -0700)]
am
0d7c66b3: Merge
42c94791 from open-source master
* commit '
0d7c66b3a555356315c17da48969fee28181ceda':
Fix the animation disappeared issue
Amith Yamasani [Thu, 4 Nov 2010 17:44:55 +0000 (10:44 -0700)]
Merge "For extra large devices, use a dialog style for LauncherActivity."
James Dong [Thu, 4 Nov 2010 17:32:06 +0000 (10:32 -0700)]
am
c25c28a4: (-s ours) am
c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread
* commit '
c25c28a496012f64da57f5beb3b99f7424abb602':
Revert "Support rotation in media recorder"
Scott Main [Thu, 4 Nov 2010 17:29:14 +0000 (10:29 -0700)]
am
974ea38a: am
42361551: Merge "docs: some more edits to the sdk install docs" into gingerbread
* commit '
974ea38a7c941eb8d85cea3b9a2ab87ed0b8e592':
docs: some more edits to the sdk install docs
Mathias Agopian [Thu, 4 Nov 2010 17:29:09 +0000 (10:29 -0700)]
am
b20c2e7c: am
477c4fee: Merge "[
3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
* commit '
b20c2e7ca03f5ef2694b20ff9a7a10a7249eb936':
[
3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
Hiroshi Lockheimer [Thu, 4 Nov 2010 17:29:05 +0000 (10:29 -0700)]
am
0ce42c9d: (-s ours) am
c181a082: Merge "Support rotation in media recorder" into gingerbread
* commit '
0ce42c9d315ea6bf0e4f81b14b9e1a38f8979897':
Support rotation in media recorder
Gilles Debunne [Thu, 4 Nov 2010 17:13:00 +0000 (10:13 -0700)]
Merge "Tapping on paste popup with an empty clipboard does not crash in TextView."
Gilles Debunne [Thu, 4 Nov 2010 16:57:14 +0000 (09:57 -0700)]
am
67e1ae5b: am
698dd812: Merge "ldpi assets created from hdpi in core." into gingerbread
* commit '
67e1ae5b96bc3be5f9fc57350dada06194eb7f68':
ldpi assets created from hdpi in core.
Hiroshi Lockheimer [Thu, 4 Nov 2010 16:56:57 +0000 (09:56 -0700)]
am
5f5bcf50: am
e0887cc7: Merge "Squash ANRs in UsbStorageActivity." into gingerbread
* commit '
5f5bcf5039774050eec587dcc31905bd5a370b7b':
Squash ANRs in UsbStorageActivity.
Jason Chen [Thu, 4 Nov 2010 16:29:55 +0000 (09:29 -0700)]
resolved conflicts for merge of
f0452c25 to master
Change-Id: Ie8f5e81393ac965fd570f99239ab8be8ea0db00c
Scott Main [Thu, 4 Nov 2010 16:20:40 +0000 (09:20 -0700)]
am
17c87d80: Merge "docs: more revisions to the installing docs for GB" into gingerbread
* commit '
17c87d80c65d047c2db353d9826fef3e0d4d3535':
docs: more revisions to the installing docs for GB
Scott Main [Thu, 4 Nov 2010 16:17:54 +0000 (09:17 -0700)]
Merge "docs: more revisions to the installing docs for GB" into gingerbread
Jean-Baptiste Queru [Thu, 4 Nov 2010 14:22:33 +0000 (07:22 -0700)]
Merge
42c94791 from open-source master
Change-Id: Id17a1a787b6d46c44ba39d628129a3a27f6d70be
Scott Main [Thu, 4 Nov 2010 14:20:33 +0000 (07:20 -0700)]
am
d9bb6bc2: am
08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc
* commit '
d9bb6bc283b3f7ee75da14c42c8a563214103c05':
docs: provide overview of the web apps docs and revise images in the targeting doc
satok [Thu, 4 Nov 2010 06:09:46 +0000 (23:09 -0700)]
Merge "Find the most applicable subtype when there is no selected subtype but IME has subtypes"
Jason Sams [Thu, 4 Nov 2010 06:03:06 +0000 (23:03 -0700)]
Merge "Update ScriptC constructor to remove depricated param."
Chet Haase [Thu, 4 Nov 2010 05:42:02 +0000 (22:42 -0700)]
Merge "Fixed problem with setting updated values on existing animators"
Wink Saville [Thu, 4 Nov 2010 04:58:20 +0000 (21:58 -0700)]
Merge "Allow DataConnectionTrackers to manage multiple data connections."
Justin Ho [Thu, 4 Nov 2010 03:11:28 +0000 (20:11 -0700)]
am
ade230ed: (-s ours) am
112b5b1f: Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
* commit '
ade230ed99097a09584a793ce720cc869c9ffeb4':
DO NOT MERGE - Updated VPNServices stat_sys icons
Jeff Hamilton [Thu, 4 Nov 2010 03:11:23 +0000 (20:11 -0700)]
am
1212d4fd: am
ef569469: Merge "Remove the My Tag feature." into gingerbread
* commit '
1212d4fdc9bdc09c2c4c4d676b0918172eb09380':
Remove the My Tag feature.
Romain Guy [Thu, 4 Nov 2010 03:03:42 +0000 (20:03 -0700)]
Merge "Fix rendering bug with saveLayerAlpha/drawColor."
James Dong [Thu, 4 Nov 2010 02:44:45 +0000 (19:44 -0700)]
am
c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread
* commit '
c0fa1d4791667ee8d1a9685749e42426fe8bd38b':
Revert "Support rotation in media recorder"
James Dong [Thu, 4 Nov 2010 02:42:17 +0000 (19:42 -0700)]
Merge "Revert "Support rotation in media recorder"" into gingerbread
Scott Main [Thu, 4 Nov 2010 01:04:56 +0000 (18:04 -0700)]
am
42361551: Merge "docs: some more edits to the sdk install docs" into gingerbread
* commit '
42361551b1e97884735b44dd49147ac133fa146e':
docs: some more edits to the sdk install docs
Scott Main [Thu, 4 Nov 2010 01:03:01 +0000 (18:03 -0700)]
Merge "docs: some more edits to the sdk install docs" into gingerbread
Mathias Agopian [Thu, 4 Nov 2010 00:59:47 +0000 (17:59 -0700)]
am
477c4fee: Merge "[
3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
* commit '
477c4feee2f0922dbc8952639cc12987d5cdce04':
[
3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
Hiroshi Lockheimer [Thu, 4 Nov 2010 00:59:43 +0000 (17:59 -0700)]
am
c181a082: Merge "Support rotation in media recorder" into gingerbread
* commit '
c181a08209dc85c80e4da5d20cd3980998def40d':
Support rotation in media recorder
Mathias Agopian [Thu, 4 Nov 2010 00:57:32 +0000 (17:57 -0700)]
Merge "[
3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
Hiroshi Lockheimer [Thu, 4 Nov 2010 00:57:28 +0000 (17:57 -0700)]
Merge "Support rotation in media recorder" into gingerbread
Gilles Debunne [Thu, 4 Nov 2010 00:38:50 +0000 (17:38 -0700)]
am
698dd812: Merge "ldpi assets created from hdpi in core." into gingerbread
* commit '
698dd8127636fcf57c56dcc90688fb5e8afb8abb':
ldpi assets created from hdpi in core.
Gilles Debunne [Thu, 4 Nov 2010 00:37:28 +0000 (17:37 -0700)]
Merge "ldpi assets created from hdpi in core." into gingerbread
Hiroshi Lockheimer [Thu, 4 Nov 2010 00:10:33 +0000 (17:10 -0700)]
am
e0887cc7: Merge "Squash ANRs in UsbStorageActivity." into gingerbread
* commit '
e0887cc7febe2a03f1685e4aa3cb131c455d8cd0':
Squash ANRs in UsbStorageActivity.
Hiroshi Lockheimer [Thu, 4 Nov 2010 00:08:03 +0000 (17:08 -0700)]
Merge "Squash ANRs in UsbStorageActivity." into gingerbread
Dmitry Shmidt [Thu, 4 Nov 2010 00:06:29 +0000 (17:06 -0700)]
Merge "bugreport: Fix dump of netcfg command"
Robert Greenwalt [Thu, 4 Nov 2010 00:05:24 +0000 (17:05 -0700)]
Merge "Add some network/phone type constants."
Romain Guy [Wed, 3 Nov 2010 23:23:41 +0000 (16:23 -0700)]
Merge "Fix rendering issue with layers."
Alexander Lucas [Wed, 3 Nov 2010 22:35:29 +0000 (15:35 -0700)]
am
6f4a084e: Merge "Added SIP Demo" into gingerbread
* commit '
6f4a084e33c917b7e04309a4296404aef7325fca':
Added SIP Demo
Alexander Lucas [Wed, 3 Nov 2010 22:32:57 +0000 (15:32 -0700)]
Merge "Added SIP Demo" into gingerbread
Scott Main [Wed, 3 Nov 2010 22:18:10 +0000 (15:18 -0700)]
am
08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc
* commit '
08810efc1a1868261fb042355f75ab049438b6e3':
docs: provide overview of the web apps docs and revise images in the targeting doc
Jaikumar Ganesh [Wed, 3 Nov 2010 21:58:00 +0000 (14:58 -0700)]
Merge "Add STATE_AUDIO_CONNECTING state."
Andreas Huber [Wed, 3 Nov 2010 21:40:27 +0000 (14:40 -0700)]
Merge "Experimentally reenable mpeg4 and h.263 hardware decoders."
Shimeng (Simon) Wang [Wed, 3 Nov 2010 21:33:28 +0000 (14:33 -0700)]
Merge "Prevent 0 content width."
Jason Sams [Wed, 3 Nov 2010 21:29:16 +0000 (14:29 -0700)]
Merge "RS Error cleanup. Thow java exception during init if the GL driver fails rather than native crash."
Bryan Mawhinney [Wed, 3 Nov 2010 21:05:54 +0000 (14:05 -0700)]
Merge "Avoid copying byte arrays when just decoding bounds."
Justin Ho [Wed, 3 Nov 2010 20:43:09 +0000 (13:43 -0700)]
am
112b5b1f: Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
* commit '
112b5b1f304846a1f6999a8347f45dae43719b8f':
DO NOT MERGE - Updated VPNServices stat_sys icons
Justin Ho [Wed, 3 Nov 2010 20:39:26 +0000 (13:39 -0700)]
Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
Jeff Hamilton [Wed, 3 Nov 2010 20:37:22 +0000 (13:37 -0700)]
am
ef569469: Merge "Remove the My Tag feature." into gingerbread
* commit '
ef5694692f88bb91ed6ee1191b11a66ec594ff39':
Remove the My Tag feature.
Jeff Hamilton [Wed, 3 Nov 2010 20:34:39 +0000 (13:34 -0700)]
Merge "Remove the My Tag feature." into gingerbread
Xavier Ducrohet [Wed, 3 Nov 2010 20:30:22 +0000 (13:30 -0700)]
Merge "Layoutlib native delegate: primitive shapes and shaders"
Xavier Ducrohet [Wed, 3 Nov 2010 20:30:17 +0000 (13:30 -0700)]
Merge "More layout Canvas/Paint implementation."
Daniel Sandler [Wed, 3 Nov 2010 19:42:35 +0000 (12:42 -0700)]
am
9f4f20c2: am
65816a32: Merge "Fix the fix for storage ANRs." into gingerbread
* commit '
9f4f20c2451325850cb81e886f1e76155e7e098d':
Fix the fix for storage ANRs.
Daniel Sandler [Wed, 3 Nov 2010 19:38:40 +0000 (12:38 -0700)]
am
65816a32: Merge "Fix the fix for storage ANRs." into gingerbread
* commit '
65816a32ee2c2181895e3be636f3173a6e769f67':
Fix the fix for storage ANRs.
Daniel Sandler [Wed, 3 Nov 2010 19:36:31 +0000 (12:36 -0700)]
Merge "Fix the fix for storage ANRs." into gingerbread
Irfan Sheriff [Wed, 3 Nov 2010 19:23:01 +0000 (12:23 -0700)]
Merge "Set country code in the driver and remove channel set"
Gilles Debunne [Wed, 3 Nov 2010 19:21:16 +0000 (12:21 -0700)]
Merge "Tapping in a empty textEdit shows the handle."
Ben Komalo [Wed, 3 Nov 2010 19:18:40 +0000 (12:18 -0700)]
Merge "Fix issue where home layout click listener was being attached before it was initialized."
Adam Powell [Wed, 3 Nov 2010 19:06:44 +0000 (12:06 -0700)]
Merge "Make Theme.Holo.Dialog.Alert and Theme.Holo.Light.Dialog.Alert public"
James Dong [Wed, 3 Nov 2010 19:02:53 +0000 (12:02 -0700)]
am
a3f5b615: (-s ours) am
f3847e87: Merge "DO NOT MERGE" into gingerbread
* commit '
a3f5b615d7adc5a644cbedd55100deba562ec0ac':
DO NOT MERGE
Chris Tate [Wed, 3 Nov 2010 19:00:56 +0000 (12:00 -0700)]
Merge "Fix drag enter/exit reporting"
Dianne Hackborn [Wed, 3 Nov 2010 18:43:16 +0000 (11:43 -0700)]
am
0ce0f72c: am
906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold operations."
* commit '
0ce0f72c1eb92cf654667c15477f19b4a7e84cd1':
Revert "UMS: Avoid SystemUI ANRs during long vold operations."
Daniel Sandler [Wed, 3 Nov 2010 18:43:03 +0000 (11:43 -0700)]
am
1df8765a: am
cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread
* commit '
1df8765ac05ed83c212e899fa6c74a6cc012e7b0':
UMS: Avoid SystemUI ANRs during long vold operations.
Jason parks [Wed, 3 Nov 2010 18:42:40 +0000 (11:42 -0700)]
am
bcbf17a5: am
73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
* commit '
bcbf17a5823380b59ad5617c79c1f14d365bdc23':
Return a zero length byte from toByteArray instead of null.
Dirk Dougherty [Wed, 3 Nov 2010 18:42:31 +0000 (11:42 -0700)]
am
243a28ba: am
4e4d0d5f: am
36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
* commit '
243a28ba2d58acea96a33cd6c73cb805a653863f':
Doc change: Update uses-feature and permissions docs.
Brad Fitzpatrick [Wed, 3 Nov 2010 18:42:19 +0000 (11:42 -0700)]
am
f3a6b901: am
9df48a03: Merge "NotificationManager: droiddoc documentation improvements"
* commit '
f3a6b901917b1609c6f1901bb36deb07a58fd20d':
NotificationManager: droiddoc documentation improvements
Gloria Wang [Wed, 3 Nov 2010 18:39:04 +0000 (11:39 -0700)]
resolved conflicts for merge of
a8d7b747 to master
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
Nick Pelly [Wed, 3 Nov 2010 17:59:54 +0000 (10:59 -0700)]
am
6fb9316f: am
38e561dd: Merge "Remove timeout support." into gingerbread
* commit '
6fb9316f6bd72b406bbfc61bd210281744eea9c1':
Remove timeout support.
Jean-Baptiste Queru [Wed, 3 Nov 2010 17:59:44 +0000 (10:59 -0700)]
am
c91e4673: am
bbd212d7: Merge "Document per-implementation behaviors of native get* methods"
* commit '
c91e46730d14611fb85cd7b2d3e51dac5ce538a2':
Document per-implementation behaviors of native get* methods
Jean-Baptiste Queru [Wed, 3 Nov 2010 17:59:36 +0000 (10:59 -0700)]
am
0b5d57ab: am
715f8610: Merge "Clarify documentation of Cursor get* methods."
* commit '
0b5d57ab7ea062af4502be5af2d51883d251c0bc':
Clarify documentation of Cursor get* methods.
Gloria Wang [Wed, 3 Nov 2010 17:59:23 +0000 (10:59 -0700)]
am
cf393faa: Merge "resolved conflicts for merge of
c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp
* commit '
cf393faaa871333496a63c13196fdbc0f2bd9118':
- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled.
Joe Malin [Wed, 3 Nov 2010 17:59:03 +0000 (10:59 -0700)]
am
fcea62a6: am
c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread
* commit '
fcea62a64cba3422ae7d0c1eeee529fd49485984':
DOC CHANGE: Add entry for monkeyrunner to tools index page.
Raphael [Wed, 3 Nov 2010 17:58:47 +0000 (10:58 -0700)]
am
19ed73ae: am
46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread
* commit '
19ed73ae7fddf66b335a89a33d346a5b50c1f274':
Support for <compatible-screens><screen> in ADT.
Gilles Debunne [Wed, 3 Nov 2010 17:58:09 +0000 (10:58 -0700)]
am
a090d64a: (-s ours) am
18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbread
* commit '
a090d64ac198b878a3ea01204298d5ed5eb8fbb8':
Rescaled/updated mdpi assets added.
Gilles Debunne [Wed, 3 Nov 2010 17:50:29 +0000 (10:50 -0700)]
am
51b9cc04: (-s ours) am
94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbread
* commit '
51b9cc04e816a2bd613ad624b3ed7c6f12381928':
Rescaled/updated mdpi assets added.
Jean-Baptiste Queru [Wed, 3 Nov 2010 17:16:30 +0000 (10:16 -0700)]
Merge "Fix the animation disappeared issue"
James Dong [Wed, 3 Nov 2010 16:25:08 +0000 (09:25 -0700)]
am
f3847e87: Merge "DO NOT MERGE" into gingerbread
* commit '
f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
DO NOT MERGE
James Dong [Wed, 3 Nov 2010 16:21:44 +0000 (09:21 -0700)]
Merge "DO NOT MERGE" into gingerbread
Dianne Hackborn [Wed, 3 Nov 2010 05:28:10 +0000 (22:28 -0700)]
am
906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold operations."
* commit '
906b830d1d61cbd8b1f9c2dc87e564cfb0f315fd':
Revert "UMS: Avoid SystemUI ANRs during long vold operations."
Daniel Sandler [Wed, 3 Nov 2010 03:35:17 +0000 (20:35 -0700)]
am
cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread
* commit '
cbc3219d2864a0b8d8ee6cda2c0b9a679bdeb200':
UMS: Avoid SystemUI ANRs during long vold operations.
Daniel Sandler [Wed, 3 Nov 2010 03:34:10 +0000 (20:34 -0700)]
Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread
Gil Dobjanschi [Wed, 3 Nov 2010 03:26:22 +0000 (20:26 -0700)]
Merge "Use SoftReference for WaveformData"
Jason parks [Wed, 3 Nov 2010 02:00:12 +0000 (19:00 -0700)]
am
73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
* commit '
73eba2a6bcf39eb20d815517ed11e1a7fb7a2c39':
Return a zero length byte from toByteArray instead of null.
Jason parks [Wed, 3 Nov 2010 01:58:09 +0000 (18:58 -0700)]
Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
Xavier Ducrohet [Wed, 3 Nov 2010 01:28:16 +0000 (18:28 -0700)]
Merge "More implementation of the layoutlib Paint/Canvas delegates."
Jeff Brown [Wed, 3 Nov 2010 01:23:55 +0000 (18:23 -0700)]
Merge "Fix a key repeating bug."
Jeff Brown [Wed, 3 Nov 2010 00:58:22 +0000 (17:58 -0700)]
Fix a key repeating bug.
This change fixes a bug in the dispatcher where the window manager
policy would incorrectly receive a key repeat count of 0 in the case
where the key repeat was generated by the hardware or driver.
Long-press on HOME was broken as a result.
Bug:
3159581
Change-Id: If0f02662313f5b879a4e566fbb461389e274a550
Dirk Dougherty [Wed, 3 Nov 2010 00:47:20 +0000 (17:47 -0700)]
am
4e4d0d5f: am
36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
* commit '
4e4d0d5f207421b0a2ce134fe17d7c78defc9dac':
Doc change: Update uses-feature and permissions docs.
Dirk Dougherty [Wed, 3 Nov 2010 00:43:54 +0000 (17:43 -0700)]
am
36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
* commit '
36a1bcee76d35636b4050674eb98285c3a3a6c2f':
Doc change: Update uses-feature and permissions docs.
Dirk Dougherty [Wed, 3 Nov 2010 00:40:27 +0000 (17:40 -0700)]
Merge "Doc change: Update uses-feature and permissions docs." into froyo
Jeff Brown [Wed, 3 Nov 2010 00:38:18 +0000 (17:38 -0700)]
Merge "Add plumbing for volume mute key."