OSDN Git Service
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.
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.
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.
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
Gilles Debunne [Fri, 29 Apr 2011 20:30:03 +0000 (13:30 -0700)]
Merge "SuggestionSpans are removed around edited text."
Robert Greenwalt [Fri, 29 Apr 2011 17:26:26 +0000 (10:26 -0700)]
am
67c92fbd: am
5f2ff42b: Add data to bugreports.
* commit '
67c92fbdfe52a94804f021c2255132c0f3550875':
Add data to bugreports.
Robert Greenwalt [Fri, 29 Apr 2011 17:14:26 +0000 (10:14 -0700)]
am
5f2ff42b: Add data to bugreports.
* commit '
5f2ff42b282e093b61b9e7b07c79a74ea8ce3272':
Add data to bugreports.
Gilles Debunne [Fri, 29 Apr 2011 16:51:46 +0000 (09:51 -0700)]
Merge "TextView uses WordIterator to select words."
Hung-ying Tyan [Fri, 29 Apr 2011 07:34:36 +0000 (00:34 -0700)]
Merge "Turn on SIP phone support by default."
Conley Owens [Fri, 29 Apr 2011 06:52:45 +0000 (23:52 -0700)]
am
e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
* commit '
e17870092941cecf64956819d395ec34111cbe71':
Added null check on return value for getKeyDispatcherState()
Conley Owens [Fri, 29 Apr 2011 06:52:41 +0000 (23:52 -0700)]
am
501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
* commit '
501f7bca83ecc2200a590966e461590d9716df7d':
Eliminating dead logic - bitmap state simply cannot be null here.
Conley Owens [Fri, 29 Apr 2011 06:52:37 +0000 (23:52 -0700)]
am
11d7ec24: Merge "Removing unnecessary computation."
* commit '
11d7ec24a55319b68bcc96443372c263a41b7dc5':
Removing unnecessary computation.
Conley Owens [Fri, 29 Apr 2011 06:52:32 +0000 (23:52 -0700)]
am
e41d2aed: Merge "Using robust equality check."
* commit '
e41d2aed9c8d990d31af70642ae688dad1d8fb4b':
Using robust equality check.
Conley Owens [Fri, 29 Apr 2011 06:52:26 +0000 (23:52 -0700)]
am
1e29552b: Merge "We don\'t need these local references."
* commit '
1e29552bd5feeb24952a0486e3263396978212df':
We don't need these local references.
Conley Owens [Fri, 29 Apr 2011 06:52:21 +0000 (23:52 -0700)]
am
da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit '
da882181245fdf3eca827680d656cd298c9c318f':
Eliminating dead code with no other effect than consuming battery life.
Mathias Agopian [Fri, 29 Apr 2011 03:14:54 +0000 (20:14 -0700)]
Merge "get rid of dependency on copybit HAL module"
Mathias Agopian [Fri, 29 Apr 2011 02:50:21 +0000 (19:50 -0700)]
get rid of dependency on copybit HAL module
Change-Id: Ia608099a2426c11a91d33063ba53c93e1eccb428
Romain Guy [Fri, 29 Apr 2011 02:42:56 +0000 (19:42 -0700)]
Merge "Fix the build."
Romain Guy [Fri, 29 Apr 2011 01:55:58 +0000 (18:55 -0700)]
Merge "This file should not be here."
Romain Guy [Fri, 29 Apr 2011 01:55:29 +0000 (18:55 -0700)]
This file should not be here.
Change-Id: I0ccb41869303fa765ed13763bf17c7e0ee9f036e
Romain Guy [Fri, 29 Apr 2011 01:47:01 +0000 (18:47 -0700)]
Merge "New widget: TextureView Bug #
4343984"
Daisuke Miyakawa [Thu, 28 Apr 2011 23:19:23 +0000 (16:19 -0700)]
Merge "Use passive provider for location based country detection"
Gilles Debunne [Thu, 28 Apr 2011 22:48:05 +0000 (15:48 -0700)]
Merge "TextView's baseline is correctly computed for empty text."
Conley Owens [Thu, 28 Apr 2011 22:07:00 +0000 (15:07 -0700)]
Merge "Added null check on return value for getKeyDispatcherState()"
Jamie Gennis [Thu, 28 Apr 2011 22:03:56 +0000 (15:03 -0700)]
Merge "libgui: enable tests in the 'tests' build."
Conley Owens [Thu, 28 Apr 2011 21:57:14 +0000 (14:57 -0700)]
Merge "Eliminating dead logic - bitmap state simply cannot be null here."
Conley Owens [Thu, 28 Apr 2011 21:57:11 +0000 (14:57 -0700)]
Merge "Removing unnecessary computation."
Conley Owens [Thu, 28 Apr 2011 21:57:08 +0000 (14:57 -0700)]
Merge "Using robust equality check."
Conley Owens [Thu, 28 Apr 2011 21:56:59 +0000 (14:56 -0700)]
Merge "We don't need these local references."
Conley Owens [Thu, 28 Apr 2011 21:56:55 +0000 (14:56 -0700)]
Merge "Eliminating dead code with no other effect than consuming battery life."
Scott Main [Thu, 28 Apr 2011 21:34:29 +0000 (14:34 -0700)]
am
c932a56a: am
d7f739b1: am
114ba198: am
c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug
4257430" into honeycomb
* commit '
c932a56ac84d680fd8f38c913c7e76105cfc0597':
docs: fix for Misdirected link in topic Declaring Layout bug
4257430
Scott Main [Thu, 28 Apr 2011 21:32:02 +0000 (14:32 -0700)]
am
d7f739b1: am
114ba198: am
c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug
4257430" into honeycomb
* commit '
d7f739b13e0336d6dd02df18d16a73636a795c3f':
docs: fix for Misdirected link in topic Declaring Layout bug
4257430
Scott Main [Thu, 28 Apr 2011 21:25:22 +0000 (14:25 -0700)]
am
114ba198: am
c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug
4257430" into honeycomb
* commit '
114ba198f5ae19fc0a632e18369a912c54a0c44e':
docs: fix for Misdirected link in topic Declaring Layout bug
4257430
Scott Main [Thu, 28 Apr 2011 21:21:46 +0000 (14:21 -0700)]
am
c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug
4257430" into honeycomb
* commit '
c59e80c4eb60a0ba665571fee2f9561aa6e936ff':
docs: fix for Misdirected link in topic Declaring Layout bug
4257430
Scott Main [Thu, 28 Apr 2011 21:08:57 +0000 (14:08 -0700)]
Merge "docs: fix for Misdirected link in topic Declaring Layout bug
4257430" into honeycomb
Wink Saville [Thu, 28 Apr 2011 20:55:59 +0000 (13:55 -0700)]
am
418e486a: am
a68a61df: Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE
* commit '
418e486a1cae97fccaa4da0128f255685d9a7e12':
Telephony: Data availability indication upon records loaded.
Wink Saville [Thu, 28 Apr 2011 20:54:14 +0000 (13:54 -0700)]
am
a68a61df: Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE
* commit '
a68a61dfe37969426c535d076a20181155493226':
Telephony: Data availability indication upon records loaded.
Wink Saville [Thu, 28 Apr 2011 20:54:04 +0000 (13:54 -0700)]
am
f49a96aa: am
05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE
* commit '
f49a96aa7683bba0536a68f2c043905c6c5f92fb':
Telephony: Corrections to signal strength values.
Kazuhiro Ondo [Thu, 28 Apr 2011 20:54:01 +0000 (13:54 -0700)]
am
5bc9d478: am
379cbb1d: Send STK Service Running RIL Request after sim module is ready
* commit '
5bc9d478517739bdcd79951e865f26481b79ddfc':
Send STK Service Running RIL Request after sim module is ready
Wink Saville [Thu, 28 Apr 2011 20:52:28 +0000 (13:52 -0700)]
am
05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE
* commit '
05fcd239abcdfe0c39e1d1d1f462478bf1e68e04':
Telephony: Corrections to signal strength values.
Kazuhiro Ondo [Thu, 28 Apr 2011 20:52:26 +0000 (13:52 -0700)]
am
379cbb1d: Send STK Service Running RIL Request after sim module is ready
* commit '
379cbb1dcc4f9c7f4ca485bc34ec056e87456c8d':
Send STK Service Running RIL Request after sim module is ready
Wink Saville [Thu, 28 Apr 2011 20:51:31 +0000 (13:51 -0700)]
Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 20:51:22 +0000 (13:51 -0700)]
Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE
Conley Owens [Thu, 28 Apr 2011 19:00:53 +0000 (12:00 -0700)]
am
e6e3322a: am
8fff7805: Merge "Remove duplicate \'=\' in exception message"
* commit '
e6e3322a3baef4cce7d382a7890718a805c4bd3b':
Remove duplicate '=' in exception message
Conley Owens [Thu, 28 Apr 2011 18:57:48 +0000 (11:57 -0700)]
am
8fff7805: Merge "Remove duplicate \'=\' in exception message"
* commit '
8fff7805ab1ccde8321697116ed3dd2fae5340ed':
Remove duplicate '=' in exception message
Wink Saville [Thu, 28 Apr 2011 18:55:00 +0000 (11:55 -0700)]
am
7848b71b: am
7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
* commit '
7848b71b4ff0d50030b528db931d5460b2a3e9e8':
GsmDCT: Reset DataConnection upon APN disable.
Wink Saville [Thu, 28 Apr 2011 18:54:57 +0000 (11:54 -0700)]
am
e4c7f3ba: am
1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
* commit '
e4c7f3ba0fd3cb8f2fce39cd76c36c0df3692eae':
Remove subclass cast for calls to isDnsCheckDisabled.
Wink Saville [Thu, 28 Apr 2011 18:54:54 +0000 (11:54 -0700)]
am
69e830dc: am
8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE
* commit '
69e830dc31a4f6fc19d8392efede114afd20fe7b':
Delay data reconnection after disconnected.
Stephen Hines [Thu, 28 Apr 2011 18:54:29 +0000 (11:54 -0700)]
Merge "Fix RS graphics samples/tests."
Wink Saville [Thu, 28 Apr 2011 18:53:08 +0000 (11:53 -0700)]
am
7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
* commit '
7353301f73bfd0fd54ca515f3385946abe56d620':
GsmDCT: Reset DataConnection upon APN disable.
Wink Saville [Thu, 28 Apr 2011 18:53:05 +0000 (11:53 -0700)]
am
1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
* commit '
1a517d0c251d2ca577500ec6c0e434725c3ddd21':
Remove subclass cast for calls to isDnsCheckDisabled.
Wink Saville [Thu, 28 Apr 2011 18:53:02 +0000 (11:53 -0700)]
am
8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE
* commit '
8daec83f9a3436819854827bcff480ce0a203ddb':
Delay data reconnection after disconnected.
Irfan Sheriff [Thu, 28 Apr 2011 18:52:56 +0000 (11:52 -0700)]
am
c1f39396: am
8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE
* commit '
c1f39396b94837f728c56b4c3e2f5c37e1d0eef7':
Define Protocol class for use with StateMachine
Wink Saville [Thu, 28 Apr 2011 18:50:24 +0000 (11:50 -0700)]
Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 18:50:15 +0000 (11:50 -0700)]
Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 18:50:05 +0000 (11:50 -0700)]
Merge "Delay data reconnection after disconnected." into honeycomb-LTE
Conley Owens [Thu, 28 Apr 2011 18:49:43 +0000 (11:49 -0700)]
am
a60594cb: Fixed bad merge in ViewRoot.java.
* commit '
a60594cb1c1399f557a82403f7fc7abb7af55250':
Fixed bad merge in ViewRoot.java.
Irfan Sheriff [Thu, 28 Apr 2011 18:48:47 +0000 (11:48 -0700)]
am
8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE
* commit '
8f87f8389866058a081e601fc0df45a3527a3150':
Define Protocol class for use with StateMachine
Eric Fischer [Thu, 28 Apr 2011 18:48:43 +0000 (11:48 -0700)]
am
b2149f4a: (-s ours) am
1d104476: (-s ours) am
a4e7353d: Import revised translations. DO NOT MERGE
* commit '
b2149f4a11cddba303674298ef543e76ea11475e':
Import revised translations. DO NOT MERGE
Conley Owens [Thu, 28 Apr 2011 18:48:25 +0000 (11:48 -0700)]
am
4854f70c: Ignore change since file no longer exists
* commit '
4854f70c0881ff44fabd8c261653bd90210bdc22':
Auto hide virtual keyboard
Stephen Hines [Thu, 28 Apr 2011 18:48:18 +0000 (11:48 -0700)]
am
5ac02e73: (-s ours) am
697f8b33: am
00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
* commit '
5ac02e73c313935b1af8a536e47f74b616986dfe':
Check setName() for null string + fix rsRand().
Conley Owens [Thu, 28 Apr 2011 18:46:39 +0000 (11:46 -0700)]
Merge "Remove duplicate '=' in exception message"
Irfan Sheriff [Thu, 28 Apr 2011 18:38:54 +0000 (11:38 -0700)]
Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE
John Reck [Thu, 28 Apr 2011 17:38:50 +0000 (10:38 -0700)]
Merge "Use previous version if version is a codename"
Eric Fischer [Thu, 28 Apr 2011 17:25:52 +0000 (10:25 -0700)]
am
1d104476: (-s ours) am
a4e7353d: Import revised translations. DO NOT MERGE
* commit '
1d10447631c9478fbf9574c3fde1997cc77ee6e4':
Import revised translations. DO NOT MERGE
Daniel Sandler [Thu, 28 Apr 2011 17:22:49 +0000 (10:22 -0700)]
Merge "Make InputWindow.h's window types align with WindowManager.java's."
Conley Owens [Thu, 28 Apr 2011 17:10:52 +0000 (10:10 -0700)]
Ignore change since file no longer exists
Jason Sams [Thu, 28 Apr 2011 06:00:40 +0000 (23:00 -0700)]
Merge "Add dalvik code for forEach."
Jason Sams [Thu, 28 Apr 2011 06:00:25 +0000 (23:00 -0700)]
Merge "Start implementing control side forEach."
Wu-cheng Li [Thu, 28 Apr 2011 04:17:52 +0000 (21:17 -0700)]
Merge "Unhide camera focus area and metering area API."
Mathias Agopian [Thu, 28 Apr 2011 02:01:01 +0000 (19:01 -0700)]
Merge "Fix uninitialized variable in SurfaceTexture"
Mathias Agopian [Thu, 28 Apr 2011 01:57:33 +0000 (18:57 -0700)]
Fix uninitialized variable in SurfaceTexture
Change-Id: Ie77cdad481fc0522ff5ea3b7e14ce94e07150793
Stephen Hines [Thu, 28 Apr 2011 00:38:53 +0000 (17:38 -0700)]
am
697f8b33: am
00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
* commit '
697f8b331bb339e4db716efbb96e2182aac40255':
Check setName() for null string + fix rsRand().
Stephen Hines [Thu, 28 Apr 2011 00:36:38 +0000 (17:36 -0700)]
am
00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
* commit '
00df8e230ef797729a3618d1d0c19cda3950c922':
Check setName() for null string + fix rsRand().
Stephen Hines [Thu, 28 Apr 2011 00:32:40 +0000 (17:32 -0700)]
Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
Dima Zavin [Thu, 28 Apr 2011 00:13:46 +0000 (17:13 -0700)]
Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73
* changes:
audioflinger: don't do work in constructor, instead do it in onFirstRef
audioflinger: enumerate all the possible audio interfaces
audio/media: convert to using the audio HAL and new audio defs
libmedia: move AudioParameter out of AudioSystem
audioflinger: move legacy audio hw/policy out to libhardware_legacy
Conley Owens [Thu, 28 Apr 2011 00:01:49 +0000 (17:01 -0700)]
am
c4791bd6: Merge commit \'
5e3562a5\' into m
* commit '
c4791bd65cdf2e487c87da0d863140337e5141cb':
onDetachedFromWindow is called before onAttachedToWindow
OSDN Git Service
