OSDN Git Service
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
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
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
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
Conley Owens [Fri, 29 Apr 2011 17:24:29 +0000 (10:24 -0700)]
am
76616b13: Merge "Scolling using arrow keys with padding"
* commit '
76616b138eb68a77a838a93fdf2f0322e982f706':
Scolling using arrow keys with padding
Conley Owens [Fri, 29 Apr 2011 17:24:23 +0000 (10:24 -0700)]
am
425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"
* commit '
425db473a05e4204301bf46d4ab6f51b12d9c447':
CHAR_SEQUENCE_CREATOR cannot handle null string
Conley Owens [Fri, 29 Apr 2011 17:24:16 +0000 (10:24 -0700)]
am
58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"
* commit '
58e4a5e2094c5003225fc715ee1a53b2461e71b1':
Fixed to draw texture when loadTexture() is called at first time
Conley Owens [Fri, 29 Apr 2011 17:24:12 +0000 (10:24 -0700)]
am
9355a24a: Merge "Fixing wrong Japanese phone formatter."
* commit '
9355a24af2a4985902f1e9ab4233df3fb831ef72':
Fixing wrong Japanese phone formatter.
Conley Owens [Fri, 29 Apr 2011 17:24:08 +0000 (10:24 -0700)]
am
9fd8e057: Merge "Fix memory leak of SkMovie class"
* commit '
9fd8e0579fb3306f61ba1716b1977562ae3626e1':
Fix memory leak of SkMovie class
Conley Owens [Fri, 29 Apr 2011 17:24:03 +0000 (10:24 -0700)]
am
8ebf3558: Merge "Implement support for ALT and SHIFT modifiers"
* commit '
8ebf35589dd2bee84ad93613df21666b8858a10f':
Implement support for ALT and SHIFT modifiers
Conley Owens [Fri, 29 Apr 2011 17:23:58 +0000 (10:23 -0700)]
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 > Google legal
* commit '
b1578d85ce1b3f3c5e2cf0271011c016b93b7e1a':
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 [Fri, 29 Apr 2011 17:23:53 +0000 (10:23 -0700)]
am
1ecd0a9b: Merge "modify the device to enable to get the state as slide-open/slide-close."
* commit '
1ecd0a9b28f8d608cac1a1db6c9bd493ace0ca3e':
modify the device to enable to get the state as slide-open/slide-close.
Conley Owens [Fri, 29 Apr 2011 17:23:47 +0000 (10:23 -0700)]
am
69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
* commit '
69ef0d55d7d7cb9b9bcccffff50ea10ac3833aaa':
Adding missing breaks in BnSurfaceComposer::onTransact
Conley Owens [Fri, 29 Apr 2011 17:23:42 +0000 (10:23 -0700)]
am
7ae9f08a: Merge "Fixed to call computeVisibleRegions() when transparent value changed"
* commit '
7ae9f08a179fa3b312b80826cfc3c6dc97b792ec':
Fixed to call computeVisibleRegions() when transparent value changed
Conley Owens [Fri, 29 Apr 2011 17:23:35 +0000 (10:23 -0700)]
am
03daee63: Merge "frameworks/base: acquire lock on am only when needed"
* commit '
03daee6380772b0ab167a7b28e37d7a21ec89c86':
frameworks/base: acquire lock on am only when needed
Conley Owens [Fri, 29 Apr 2011 17:23:28 +0000 (10:23 -0700)]
am
2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"
* commit '
2f463ef18bb235be57b39cbda536bcd2df2d0908':
Adding a sanity test in the while loop in readHistory()
Conley Owens [Fri, 29 Apr 2011 17:20:34 +0000 (10:20 -0700)]
am
c5505f6a: Merge "Improved conversion accuracy of exif geotag data"
* commit '
c5505f6a150db8232cc275bedd400f7f5a593530':
Improved conversion accuracy of exif geotag data
Conley Owens [Fri, 29 Apr 2011 17:20:25 +0000 (10:20 -0700)]
am
e1b3f15c: Merge "Fixes broken image link in "Tools -> Traceview" documentation page."
* commit '
e1b3f15cadc630469cfadea63275ba8d9a1c9052':
Fixes broken image link in "Tools -> Traceview" documentation page.
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.
Conley Owens [Fri, 29 Apr 2011 17:00:26 +0000 (10:00 -0700)]
Merge "Scolling using arrow keys with padding"
Conley Owens [Fri, 29 Apr 2011 17:00:20 +0000 (10:00 -0700)]
Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"
Conley Owens [Fri, 29 Apr 2011 17:00:12 +0000 (10:00 -0700)]
Merge "Fixed to draw texture when loadTexture() is called at first time"
Conley Owens [Fri, 29 Apr 2011 17:00:06 +0000 (10:00 -0700)]
Merge "Fixing wrong Japanese phone formatter."
Conley Owens [Fri, 29 Apr 2011 17:00:00 +0000 (10:00 -0700)]
Merge "Fix memory leak of SkMovie class"
Conley Owens [Fri, 29 Apr 2011 16:59:55 +0000 (09:59 -0700)]
Merge "Implement support for ALT and SHIFT modifiers"
Conley Owens [Fri, 29 Apr 2011 16:59:48 +0000 (09:59 -0700)]
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 > Google legal > Press search key > Touch list item or press back key > ANR popup is shown"
Conley Owens [Fri, 29 Apr 2011 16:59:42 +0000 (09:59 -0700)]
Merge "modify the device to enable to get the state as slide-open/slide-close."
Conley Owens [Fri, 29 Apr 2011 16:59:36 +0000 (09:59 -0700)]
Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
Conley Owens [Fri, 29 Apr 2011 16:59:30 +0000 (09:59 -0700)]
Merge "Fixed to call computeVisibleRegions() when transparent value changed"
Conley Owens [Fri, 29 Apr 2011 16:59:22 +0000 (09:59 -0700)]
Merge "frameworks/base: acquire lock on am only when needed"
Conley Owens [Fri, 29 Apr 2011 16:56:58 +0000 (09:56 -0700)]
Merge "Adding a sanity test in the while loop in readHistory()"
Conley Owens [Fri, 29 Apr 2011 16:48:10 +0000 (09:48 -0700)]
Merge "Improved conversion accuracy of exif geotag data"
Conley Owens [Fri, 29 Apr 2011 16:48:04 +0000 (09:48 -0700)]
Merge "Fixes broken image link in "Tools -> Traceview" documentation page."
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.
Conley Owens [Thu, 28 Apr 2011 22:07:00 +0000 (15:07 -0700)]
Merge "Added null check on return value for getKeyDispatcherState()"
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: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: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: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: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.
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
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
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
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
Conley Owens [Thu, 28 Apr 2011 17:10:52 +0000 (10:10 -0700)]
Ignore change since file no longer exists
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
Conley Owens [Wed, 27 Apr 2011 23:58:24 +0000 (16:58 -0700)]
Merge commit '
5e3562a5' into m
Conflicts:
core/java/android/view/ViewRoot.java
Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87