OSDN Git Service
Jason Sams [Tue, 3 May 2011 21:52:22 +0000 (14:52 -0700)]
Merge "Try fixing auto data inlining again."
Stephen Hines [Tue, 3 May 2011 21:32:11 +0000 (14:32 -0700)]
Merge "Clean up use of rsSetObject/rsClearObject."
Dan Morrill [Tue, 3 May 2011 20:42:02 +0000 (13:42 -0700)]
am
e21f3764: (-s ours) am
75c66458: am
8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
* commit '
e21f3764343ba3b077c6be3cad568ab9ecea85a7':
Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
Dan Morrill [Tue, 3 May 2011 19:46:20 +0000 (12:46 -0700)]
am
75c66458: am
8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
* commit '
75c664582c5ce5d94826f37cb725b447a4d62c50':
Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
Dan Morrill [Tue, 3 May 2011 19:26:16 +0000 (12:26 -0700)]
am
8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
* commit '
8325c3a89197e47cfc2eeb4117c927fb8cb91630':
Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
Eino-Ville Talvala [Tue, 3 May 2011 18:07:33 +0000 (11:07 -0700)]
Merge "Add an auto-exposure lock feature to the Camera API."
Eric Fischer [Tue, 3 May 2011 17:57:54 +0000 (10:57 -0700)]
Merge "Import revised translations."
Wink Saville [Tue, 3 May 2011 06:46:03 +0000 (23:46 -0700)]
am
3165f1a8: am
d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE
* commit '
3165f1a8eb707b36a6b2c66379c3fde85d9cc2fd':
Make DataConnection asynchronous.
Wink Saville [Tue, 3 May 2011 06:44:16 +0000 (23:44 -0700)]
am
d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE
* commit '
d0d44c4e988ecdea86c2bb04e29d8f6d20c1c631':
Make DataConnection asynchronous.
Wink Saville [Tue, 3 May 2011 06:41:29 +0000 (23:41 -0700)]
Merge "Make DataConnection asynchronous." into honeycomb-LTE
Adam Powell [Tue, 3 May 2011 05:17:24 +0000 (22:17 -0700)]
Merge "Refactoring of action bar internals"
Romain Guy [Tue, 3 May 2011 01:33:26 +0000 (18:33 -0700)]
Merge "Allows to render with an OpenGL context inside a TextureView."
Mathias Agopian [Mon, 2 May 2011 23:31:52 +0000 (16:31 -0700)]
Merge "remove last traces of copybit"
Mathias Agopian [Mon, 2 May 2011 23:27:21 +0000 (16:27 -0700)]
remove last traces of copybit
Change-Id: Ia0f13a0ee6f702256482b5eb29d7fa2aa840bfc7
Mike Lockwood [Mon, 2 May 2011 23:09:26 +0000 (16:09 -0700)]
Merge "MediaScanner: Add special casing of WMP album art files to isNoMediaPath()"
Robert Greenwalt [Mon, 2 May 2011 22:24:09 +0000 (15:24 -0700)]
Merge "resolved conflicts for merge of
db46fa25 to master"
Chet Haase [Mon, 2 May 2011 22:20:15 +0000 (15:20 -0700)]
Merge "Line endcaps for AA lines are now antialiased."
Romain Guy [Mon, 2 May 2011 22:16:25 +0000 (15:16 -0700)]
Merge "Remove unnecessary code."
Robert Greenwalt [Mon, 2 May 2011 21:41:57 +0000 (14:41 -0700)]
resolved conflicts for merge of
db46fa25 to master
Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6
Alex Sakhartchouk [Mon, 2 May 2011 21:35:20 +0000 (14:35 -0700)]
Merge "Moving renderscript GL code into the HAL This change affects - shaders - meshes - fonts - quad rendering"
Jason Sams [Mon, 2 May 2011 21:33:05 +0000 (14:33 -0700)]
Merge "Temporarly disable auto-inbanding."
Mike Lockwood [Mon, 2 May 2011 21:19:43 +0000 (14:19 -0700)]
Merge "MediaScanner: Fix bug in "no media" handling logic"
Irfan Sheriff [Mon, 2 May 2011 20:29:36 +0000 (13:29 -0700)]
am
d369d64e: am
8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
* commit '
d369d64ee7931726d479e60e64d76a31fdba4a8f':
Add DhcpStateMachine for interation with dhcpcd
Robert Greenwalt [Mon, 2 May 2011 20:29:22 +0000 (13:29 -0700)]
am
a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
* commit '
a47c40193fcbe9ca07facea78b2828afdae5e025':
Add RouteInfo objects for tracking routes.
Robert Greenwalt [Mon, 2 May 2011 20:26:52 +0000 (13:26 -0700)]
Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
Irfan Sheriff [Mon, 2 May 2011 19:26:52 +0000 (12:26 -0700)]
am
8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
* commit '
8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
Add DhcpStateMachine for interation with dhcpcd
Wink Saville [Mon, 2 May 2011 19:13:44 +0000 (12:13 -0700)]
Resolve merge conflicts for merge of
21083066 to
Change-Id: Ief83f7abdd3396af965fb86ad6815e16ce36ff5c
Wink Saville [Mon, 2 May 2011 19:05:02 +0000 (12:05 -0700)]
am
0fa7d106: am
aa44b52e: Fix bug in RIL#getDataCallState.
* commit '
0fa7d106d4e34559c6e208f731c319cf681c0583':
Fix bug in RIL#getDataCallState.
Wink Saville [Mon, 2 May 2011 18:51:36 +0000 (11:51 -0700)]
am
7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTE
* commit '
7e74c60db5261ea137c8f6672f8573873eb5814e':
Enhance AsyncChannel.
Wink Saville [Mon, 2 May 2011 18:51:20 +0000 (11:51 -0700)]
am
aa44b52e: Fix bug in RIL#getDataCallState.
* commit '
aa44b52ee07eb4937d23bb3c2464007a2eb3f50f':
Fix bug in RIL#getDataCallState.
Irfan Sheriff [Mon, 2 May 2011 18:49:46 +0000 (11:49 -0700)]
Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
Wink Saville [Mon, 2 May 2011 17:47:05 +0000 (10:47 -0700)]
Merge "Enhance AsyncChannel." into honeycomb-LTE
Conley Owens [Mon, 2 May 2011 17:37:40 +0000 (10:37 -0700)]
am
a3dcd0a3: (-s ours) Merged "Adjust mBiggerTouchSlopSquare to the suitable value"
* commit '
a3dcd0a3f1b48fc0d675db7e32c27415a14f6d08':
Adjust mBiggerTouchSlopSquare to the suitable value
Conley Owens [Mon, 2 May 2011 17:28:26 +0000 (10:28 -0700)]
am
dddaa56f: Merge commit \'
b737647d\' (Scrolling using arrow keys with padding) into m
* commit '
dddaa56f793ad9ecb4e20df746f562ac7f24d158':
Scolling using arrow keys with padding
Conley Owens [Mon, 2 May 2011 17:25:55 +0000 (10:25 -0700)]
Merge commit '
f395e304' into m
Conflicts:
core/tests/coretests/src/android/text/TextUtilsTest.java
Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784
Conley Owens [Mon, 2 May 2011 17:12:00 +0000 (10:12 -0700)]
am
08acaec6: am
a47c0d29: am
58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"
* commit '
08acaec6df66bd6a12b1e63016ed998abff4afdc':
Fixed to draw texture when loadTexture() is called at first time
Conley Owens [Mon, 2 May 2011 17:11:56 +0000 (10:11 -0700)]
am
737b5c58: am
520dd927: am
9355a24a: Merge "Fixing wrong Japanese phone formatter."
* commit '
737b5c58c9094e5759bd4162f23f73be2b71faaf':
Fixing wrong Japanese phone formatter.
Conley Owens [Mon, 2 May 2011 17:11:52 +0000 (10:11 -0700)]
am
1eb31b43: am
718516f3: am
9fd8e057: Merge "Fix memory leak of SkMovie class"
* commit '
1eb31b434fdc325c55b65ecf1783c63b2fdfa669':
Fix memory leak of SkMovie class
Conley Owens [Mon, 2 May 2011 17:11:48 +0000 (10:11 -0700)]
am
64248af3: Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMap.cpp
* commit '
64248af314593fe8ffed57ac9a0f43dede26bfc2':
Implement support for ALT and SHIFT modifiers
Conley Owens [Mon, 2 May 2011 17:11:43 +0000 (10:11 -0700)]
am
c30d7676: am
1a846ab0: am
b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal
* commit '
c30d767628861b0bbea907824682e47732c820f9':
Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
Conley Owens [Mon, 2 May 2011 17:11:39 +0000 (10:11 -0700)]
am
faedfc1e: Ignore slide ui change because it is obselete in newly-refactored code
* commit '
faedfc1e9be10ab29d563b7aede57cdac6e44799':
modify the device to enable to get the state as slide-open/slide-close.
Conley Owens [Mon, 2 May 2011 17:11:34 +0000 (10:11 -0700)]
am
238ef85e: am
af99655e: am
69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
* commit '
238ef85eb6894408c5a59cdb93405001c972f450':
Adding missing breaks in BnSurfaceComposer::onTransact
Conley Owens [Mon, 2 May 2011 17:11:29 +0000 (10:11 -0700)]
am
0921eae1: Ignore fix since it is obsolete in newly refactored code
* commit '
0921eae141eebbe52762d4a1cde0edf98fefbda2':
Fixed to call computeVisibleRegions() when transparent value changed
Conley Owens [Mon, 2 May 2011 17:11:11 +0000 (10:11 -0700)]
am
92618f5f: am
52749c0b: am
03daee63: Merge "frameworks/base: acquire lock on am only when needed"
* commit '
92618f5fd9e4a0469d60cab39765b7c820c1976b':
frameworks/base: acquire lock on am only when needed
Conley Owens [Mon, 2 May 2011 16:59:30 +0000 (09:59 -0700)]
Merge commit '
5eb49e0f' into m
Conflicts:
core/java/com/android/internal/os/BatteryStatsImpl.java
Change-Id: Idc9c84c2ca7dec2540ceccead7927fddb912ff12
Conley Owens [Sat, 30 Apr 2011 01:08:16 +0000 (18:08 -0700)]
am
ba40174b: am
7bcb2f39: am
c5505f6a: Merge "Improved conversion accuracy of exif geotag data"
* commit '
ba40174bc02f35aa2f6339a04de4f8993f2cd750':
Improved conversion accuracy of exif geotag data
Conley Owens [Sat, 30 Apr 2011 01:08:06 +0000 (18:08 -0700)]
am
33e86de0: Ignore broken image fix since identical change exists in internal tree
* commit '
33e86de0af31d16acda140d8dc45a256b2509211':
Fixes broken image link in "Tools -> Traceview" documentation page.
Conley Owens [Sat, 30 Apr 2011 00:49:06 +0000 (17:49 -0700)]
Merged "Adjust mBiggerTouchSlopSquare to the suitable value"
Conflicts:
core/java/android/view/ViewConfiguration.java
Change-Id: I74de006dbb19fd878591bc90955a1c6e74aa084e
Conley Owens [Sat, 30 Apr 2011 00:35:29 +0000 (17:35 -0700)]
Merge commit '
b737647d' (Scrolling using arrow keys with padding) into m
Conflicts:
core/java/android/widget/ScrollView.java
Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80
Conley Owens [Sat, 30 Apr 2011 00:15:39 +0000 (17:15 -0700)]
am
19653c64: am
425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"
* commit '
19653c6440eaf7328ecbc01c3ca6d7a910906484':
CHAR_SEQUENCE_CREATOR cannot handle null string
Conley Owens [Sat, 30 Apr 2011 00:15:35 +0000 (17:15 -0700)]
am
a47c0d29: am
58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"
* commit '
a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a':
Fixed to draw texture when loadTexture() is called at first time
Conley Owens [Sat, 30 Apr 2011 00:15:13 +0000 (17:15 -0700)]
am
520dd927: am
9355a24a: Merge "Fixing wrong Japanese phone formatter."
* commit '
520dd927cbe02ae52add1f90e282750582a9e95e':
Fixing wrong Japanese phone formatter.
Conley Owens [Sat, 30 Apr 2011 00:15:09 +0000 (17:15 -0700)]
am
718516f3: am
9fd8e057: Merge "Fix memory leak of SkMovie class"
* commit '
718516f3b73468c480ef8d2283a1c80a6223658d':
Fix memory leak of SkMovie class
Conley Owens [Sat, 30 Apr 2011 00:12:22 +0000 (17:12 -0700)]
Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMap.cpp
Conley Owens [Sat, 30 Apr 2011 00:07:14 +0000 (17:07 -0700)]
am
1a846ab0: am
b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information >
* commit '
1a846ab089878a6b342c6bc3e8850fc2e0ef3080':
Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
Conley Owens [Sat, 30 Apr 2011 00:04:25 +0000 (17:04 -0700)]
Ignore slide ui change because it is obselete in newly-refactored code
Conley Owens [Fri, 29 Apr 2011 23:58:26 +0000 (16:58 -0700)]
am
af99655e: am
69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
* commit '
af99655e51ac549b7ef664141d676299ef48f3c0':
Adding missing breaks in BnSurfaceComposer::onTransact
Conley Owens [Fri, 29 Apr 2011 23:55:43 +0000 (16:55 -0700)]
Ignore fix since it is obsolete in newly refactored code
Conley Owens [Fri, 29 Apr 2011 23:44:20 +0000 (16:44 -0700)]
am
52749c0b: am
03daee63: Merge "frameworks/base: acquire lock on am only when needed"
* commit '
52749c0b1117a05a9c853b7d54f69a281f69cf3c':
frameworks/base: acquire lock on am only when needed
Conley Owens [Fri, 29 Apr 2011 23:44:14 +0000 (16:44 -0700)]
am
e321d064: am
2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"
* commit '
e321d06430304fa93282c765aa6070c908121a16':
Adding a sanity test in the while loop in readHistory()
Conley Owens [Fri, 29 Apr 2011 23:44:08 +0000 (16:44 -0700)]
am
7bcb2f39: am
c5505f6a: Merge "Improved conversion accuracy of exif geotag data"
* commit '
7bcb2f39154e7d4271486674c5a6db5756de6c29':
Improved conversion accuracy of exif geotag data
Conley Owens [Fri, 29 Apr 2011 23:40:38 +0000 (16:40 -0700)]
Ignore broken image fix since identical change exists in internal tree
Stephen Hines [Fri, 29 Apr 2011 23:37:46 +0000 (16:37 -0700)]
Merge "Fix bug
4355588 With auto inbanding the fifo didn't reserve the correct size. Caused failure on fifo wrap."
Gloria Wang [Fri, 29 Apr 2011 23:35:26 +0000 (16:35 -0700)]
Merge "Add setParameter/getParameter to MediaPlayer API. for bug
1982947"
Wink Saville [Fri, 29 Apr 2011 23:20:15 +0000 (16:20 -0700)]
am
dd177518: am
6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE
* commit '
dd177518b5438bf12a0ee5e1c99970cd48eb025f':
CDMALTE: Evaluate data network type in pollStateDone()
Wink Saville [Fri, 29 Apr 2011 23:17:58 +0000 (16:17 -0700)]
am
6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE
* commit '
6e748780ef01174235975508090f2e0af6c16d4d':
CDMALTE: Evaluate data network type in pollStateDone()
Wink Saville [Fri, 29 Apr 2011 23:12:59 +0000 (16:12 -0700)]
Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE
Gloria Wang [Fri, 29 Apr 2011 22:26:18 +0000 (15:26 -0700)]
Merge "Add DRM errors in the DRM frameworks to MediaErrors also. For bug
4350156."
Scott Main [Fri, 29 Apr 2011 22:11:50 +0000 (15:11 -0700)]
am
75c78dc3: am
511ec082: am
de506220: am
1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '
75c78dc364efb74c2d7c0187b3b26d0ab70e3c3e':
docs: more documentation for ProgressBar
Conley Owens [Fri, 29 Apr 2011 22:11:48 +0000 (15:11 -0700)]
am
c703b49e: am
54668b8a: am
e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
* commit '
c703b49eb13993c45a1cab7ea1130601fba1df3e':
Added null check on return value for getKeyDispatcherState()
Conley Owens [Fri, 29 Apr 2011 22:11:45 +0000 (15:11 -0700)]
am
7dcdfd79: am
f26ec38c: am
501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
* commit '
7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9':
Eliminating dead logic - bitmap state simply cannot be null here.
Conley Owens [Fri, 29 Apr 2011 22:11:41 +0000 (15:11 -0700)]
am
889bb20f: am
eef8f148: am
11d7ec24: Merge "Removing unnecessary computation."
* commit '
889bb20f1bb47437331d404a59b86e6dfa4e2e93':
Removing unnecessary computation.
Conley Owens [Fri, 29 Apr 2011 22:11:38 +0000 (15:11 -0700)]
am
bb74af7b: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
* commit '
bb74af7b13bdc72eaed19abc8c3300a6af0f1d9b':
Conley Owens [Fri, 29 Apr 2011 22:11:34 +0000 (15:11 -0700)]
am
27e8f1a3: am
8b22ef66: am
e41d2aed: Merge "Using robust equality check."
* commit '
27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c':
Using robust equality check.
Conley Owens [Fri, 29 Apr 2011 22:11:30 +0000 (15:11 -0700)]
am
014757ee: am
a9517012: am
1e29552b: Merge "We don\'t need these local references."
* commit '
014757eea22fc9cceede1548c579c33c79464001':
We don't need these local references.
Conley Owens [Fri, 29 Apr 2011 22:11:26 +0000 (15:11 -0700)]
am
49df110a: am
d66a92e6: am
da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit '
49df110aeb94ada810a8eec0540e30a25c267a56':
Eliminating dead code with no other effect than consuming battery life.
Conley Owens [Fri, 29 Apr 2011 22:11:22 +0000 (15:11 -0700)]
am
ded7c652: am
893812b2: am
e6e3322a: am
8fff7805: Merge "Remove duplicate \'=\' in exception message"
* commit '
ded7c652d754751e6fbde729d66825c69394d1cb':
Remove duplicate '=' in exception message
Nick Kralevich [Fri, 29 Apr 2011 22:11:19 +0000 (15:11 -0700)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Svetoslav Ganov [Fri, 29 Apr 2011 22:10:14 +0000 (15:10 -0700)]
Merge "Touch exploration - nits"
Scott Main [Fri, 29 Apr 2011 22:09:23 +0000 (15:09 -0700)]
am
27ad0df0: am
205d6fb3: am
be2da3c9: am
c7eb47fa: docs: tweak table headers for config qualifiers
* commit '
27ad0df013e7eac9b7b9b6b207832f5ca3bf77e3':
docs: tweak table headers for config qualifiers
James Dong [Fri, 29 Apr 2011 22:09:14 +0000 (15:09 -0700)]
am
a1f6a09a: (-s ours) am
f181e416: am
ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
* commit '
a1f6a09a86f4acd2147d4f1110eedc6643bbf80b':
Add avg bandwidth estimate every 2 seconds - do not merge.
Scott Main [Fri, 29 Apr 2011 22:05:10 +0000 (15:05 -0700)]
am
511ec082: am
de506220: am
1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '
511ec082bb198cfd04aebdccf56db6f4c8df9523':
docs: more documentation for ProgressBar
Scott Main [Fri, 29 Apr 2011 21:59:08 +0000 (14:59 -0700)]
am
de506220: am
1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '
de506220d8a3d453463e1abe1b2eb54afd48ec93':
docs: more documentation for ProgressBar
Conley Owens [Fri, 29 Apr 2011 21:57:53 +0000 (14:57 -0700)]
am
54668b8a: am
e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
* commit '
54668b8a3599559fc007af1d75c039400a05e898':
Added null check on return value for getKeyDispatcherState()
Conley Owens [Fri, 29 Apr 2011 21:57:18 +0000 (14:57 -0700)]
am
f26ec38c: am
501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
* commit '
f26ec38c344af8cf91575b461028a3033b940d49':
Eliminating dead logic - bitmap state simply cannot be null here.
Conley Owens [Fri, 29 Apr 2011 21:57:10 +0000 (14:57 -0700)]
am
eef8f148: am
11d7ec24: Merge "Removing unnecessary computation."
* commit '
eef8f148881f39feb0b1aded121bbfc63e8d30c2':
Removing unnecessary computation.
Conley Owens [Fri, 29 Apr 2011 21:56:59 +0000 (14:56 -0700)]
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
Conley Owens [Fri, 29 Apr 2011 21:56:15 +0000 (14:56 -0700)]
am
8b22ef66: am
e41d2aed: Merge "Using robust equality check."
* commit '
8b22ef66ef1a67333e2f1d4250d2c134b50ef91a':
Using robust equality check.
Scott Main [Fri, 29 Apr 2011 21:56:06 +0000 (14:56 -0700)]
am
205d6fb3: am
be2da3c9: am
c7eb47fa: docs: tweak table headers for config qualifiers
* commit '
205d6fb38d3c39a39ee9721b0d8e3649afacad18':
docs: tweak table headers for config qualifiers
Conley Owens [Fri, 29 Apr 2011 21:56:05 +0000 (14:56 -0700)]
am
a9517012: am
1e29552b: Merge "We don\'t need these local references."
* commit '
a95170122619f5442d5efbdf2e37f91dbf455ab9':
We don't need these local references.
Conley Owens [Fri, 29 Apr 2011 21:55:55 +0000 (14:55 -0700)]
am
d66a92e6: am
da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit '
d66a92e6875bfc835adf0b100607afbf4bfc2761':
Eliminating dead code with no other effect than consuming battery life.
Scott Main [Fri, 29 Apr 2011 21:55:43 +0000 (14:55 -0700)]
am
1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '
1462813a28270d4255f9542b666960182e274a6e':
docs: more documentation for ProgressBar
Conley Owens [Fri, 29 Apr 2011 21:55:35 +0000 (14:55 -0700)]
am
893812b2: am
e6e3322a: am
8fff7805: Merge "Remove duplicate \'=\' in exception message"
* commit '
893812b2ee4a640ad398f7f79f90b92d52a5f3b1':
Remove duplicate '=' in exception message
James Dong [Fri, 29 Apr 2011 21:53:30 +0000 (14:53 -0700)]
am
f181e416: am
ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
* commit '
f181e416ee3f104e79be2c2a76e9c1c25a214e17':
Add avg bandwidth estimate every 2 seconds - do not merge.
Scott Main [Fri, 29 Apr 2011 21:52:20 +0000 (14:52 -0700)]
Merge "docs: more documentation for ProgressBar" into honeycomb
Jason Sams [Fri, 29 Apr 2011 21:51:37 +0000 (14:51 -0700)]
Merge "Pipe rsa function though the RS api table."
Jason Sams [Fri, 29 Apr 2011 21:50:09 +0000 (14:50 -0700)]
Merge "Fix fifo size check code."
Scott Main [Fri, 29 Apr 2011 21:46:28 +0000 (14:46 -0700)]
am
be2da3c9: am
c7eb47fa: docs: tweak table headers for config qualifiers
* commit '
be2da3c9b64c7ced6acc9933e0b941a8ee4239fb':
docs: tweak table headers for config qualifiers
James Dong [Fri, 29 Apr 2011 21:42:58 +0000 (14:42 -0700)]
am
ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
* commit '
ec78f551b575b0274cbe796f8e08a9df1a706680':
Add avg bandwidth estimate every 2 seconds - do not merge.
Scott Main [Fri, 29 Apr 2011 21:42:55 +0000 (14:42 -0700)]
am
c7eb47fa: docs: tweak table headers for config qualifiers
* commit '
c7eb47fad4fe39bd85c6205e38426c1867b9ed92':
docs: tweak table headers for config qualifiers
OSDN Git Service
