git.osdn.net Git - android-x86/frameworks-native.git/log

Xavier Ducrohet [Mon, 23 May 2011 17:22:00 +0000 (10:22 -0700)]

am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.

* commit '5b9ec6871afaf40325abe602cd1d29ddbd88cbb9':
Merge e57aa434 from honeycomb-mr1. do not merge.

commit | commitdiff | tree

Xavier Ducrohet [Mon, 23 May 2011 17:21:57 +0000 (10:21 -0700)]

am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread

* commit '041fd74beade4e95cff6157af9dadbf9a99b7fcf':
Merge 05b7b69c from honeycomb-mr1. do not merge.

commit | commitdiff | tree

Xavier Ducrohet [Mon, 23 May 2011 17:21:49 +0000 (10:21 -0700)]

am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread

* commit '9d9a7466cd051748ba656acd39265099294c4153':
Merge 2fae858d from Honeycomb-mr1. do not merge.

commit | commitdiff | tree

Xavier Ducrohet [Mon, 23 May 2011 16:52:55 +0000 (09:52 -0700)]

am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.

* commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525':
Merge e57aa434 from honeycomb-mr1. do not merge.

commit | commitdiff | tree

Xavier Ducrohet [Mon, 23 May 2011 16:52:52 +0000 (09:52 -0700)]

am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread

* commit 'f791863f0ac67ab6abd7410d5807d716cffc5b72':
Merge 05b7b69c from honeycomb-mr1. do not merge.

commit | commitdiff | tree

Xavier Ducrohet [Mon, 23 May 2011 16:52:41 +0000 (09:52 -0700)]

am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread

* commit 'bb43828aa749e71d4e52ba69db01b83c83a755b5':
Merge 2fae858d from Honeycomb-mr1. do not merge.

commit | commitdiff | tree

Kazuhiro Ondo [Sat, 21 May 2011 20:02:17 +0000 (13:02 -0700)]

am f96a6150: Data reconnection issue after airplane mode

* commit 'f96a6150e4e6c37f8952456bf9f84714f622713d':
Data reconnection issue after airplane mode

commit | commitdiff | tree

Kazuhiro Ondo [Sat, 21 May 2011 19:50:18 +0000 (12:50 -0700)]

am 4c88be65: GSM DCT: Update poll stats to support multi-links

* commit '4c88be655e387011c6d57c6d68b5deb94f6ce601':
GSM DCT: Update poll stats to support multi-links

commit | commitdiff | tree

Wink Saville [Sat, 21 May 2011 18:13:07 +0000 (11:13 -0700)]

am 15cd6ec2: Tear down connection with unwanted linkproperty change

* commit '15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1':
Tear down connection with unwanted linkproperty change

commit | commitdiff | tree

Wink Saville [Sat, 21 May 2011 06:37:28 +0000 (23:37 -0700)]

am 16e8d22b: Fix build.

* commit '16e8d22b206fb0c8b8b5a243ea13e08597f60ebc':
Fix build.

commit | commitdiff | tree

Wink Saville [Sat, 21 May 2011 00:26:58 +0000 (17:26 -0700)]

am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE

* commit '5f353de96beca0a400796887e737314a62e35b6a':
Notify RIL that PDP reset is triggered due to data stall

commit | commitdiff | tree

Wink Saville [Sat, 21 May 2011 00:23:45 +0000 (17:23 -0700)]

Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE

commit | commitdiff | tree

John Wang [Sat, 21 May 2011 00:22:50 +0000 (17:22 -0700)]

am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE

* commit '393eb0d06b4536591584a8d4c5fb03c2962835a9':
Add UI to handle SIM swap.

commit | commitdiff | tree

John Wang [Sat, 21 May 2011 00:18:56 +0000 (17:18 -0700)]

Merge "Add UI to handle SIM swap." into honeycomb-LTE

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 23:56:51 +0000 (16:56 -0700)]

am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2

* commit '67cd389d4b9b6fd3ea0df8af57f58816d8005a4b':
Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 23:51:49 +0000 (16:51 -0700)]

am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2

* commit '2c7906eb392c6349e6f75fd2681310b934d6e262':
Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI

commit | commitdiff | tree

Wink Saville [Fri, 20 May 2011 23:51:29 +0000 (16:51 -0700)]

am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE

* commit '2b534e770dadc4b3180863a393fd89094d0f07a7':
Fix broken data retry

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 23:49:08 +0000 (16:49 -0700)]

Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2

commit | commitdiff | tree

Wink Saville [Fri, 20 May 2011 23:47:54 +0000 (16:47 -0700)]

Merge "Fix broken data retry" into honeycomb-LTE

commit | commitdiff | tree

Adam Powell [Fri, 20 May 2011 23:14:42 +0000 (16:14 -0700)]

am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2

* commit 'f483ed90401d63b7317f823fcac10315146d3072':
Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.

commit | commitdiff | tree

Wink Saville [Fri, 20 May 2011 23:14:33 +0000 (16:14 -0700)]

am f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE

* commit 'f89ea7a5ec3af366a825c2e2cfc4f4c1f05de4c4':
Change getLteOnCdmaModeStatic to dynamically determine its result.

commit | commitdiff | tree

Dianne Hackborn [Fri, 20 May 2011 23:13:54 +0000 (16:13 -0700)]

am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2

* commit '5c8caba2e590792531ffb2c9f4ea924993662abd':
Add ParcelFileDescriptor.fromFd() and .adoptFd().

commit | commitdiff | tree

Adam Powell [Fri, 20 May 2011 23:02:21 +0000 (16:02 -0700)]

am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2

* commit 'bdc26dc34a5d848883d5acdee62f5b4403e8fe04':
Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.

commit | commitdiff | tree

Adam Powell [Fri, 20 May 2011 22:59:19 +0000 (15:59 -0700)]

Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2

commit | commitdiff | tree

Robert Greenwalt [Fri, 20 May 2011 22:45:55 +0000 (15:45 -0700)]

resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp

Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d

commit | commitdiff | tree

Wink Saville [Fri, 20 May 2011 22:27:03 +0000 (15:27 -0700)]

Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE

commit | commitdiff | tree

Jaikumar Ganesh [Fri, 20 May 2011 21:52:48 +0000 (14:52 -0700)]

am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."

* commit 'd1735ef91af201ff140f8d954dd07eff80836d20':
Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.

commit | commitdiff | tree

Jaikumar Ganesh [Fri, 20 May 2011 21:52:27 +0000 (14:52 -0700)]

am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code."

* commit 'd7030e551aa99ed9f533d46de5f3443ceb4c5703':
BT: Wrong publishing result of bonding error code.

commit | commitdiff | tree

Dianne Hackborn [Fri, 20 May 2011 21:32:35 +0000 (14:32 -0700)]

am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2

* commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
Add ParcelFileDescriptor.fromFd() and .adoptFd().

commit | commitdiff | tree

Dianne Hackborn [Fri, 20 May 2011 21:28:43 +0000 (14:28 -0700)]

Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2

commit | commitdiff | tree

Robert Greenwalt [Fri, 20 May 2011 21:25:29 +0000 (14:25 -0700)]

Merge "Simplfy getActive* calls in ConnectivityService" into honeycomb-LTE

commit | commitdiff | tree

Jaikumar Ganesh [Fri, 20 May 2011 21:21:29 +0000 (14:21 -0700)]

am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."

* commit '4b41df613db19c5fe1d8c0d05ef314326fd3f95b':
Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.

commit | commitdiff | tree

Jaikumar Ganesh [Fri, 20 May 2011 21:21:23 +0000 (14:21 -0700)]

am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code."

* commit '198ed3e46af4bd51fa6be0186bacdde9e832ba94':
BT: Wrong publishing result of bonding error code.

commit | commitdiff | tree

Xavier Ducrohet [Fri, 20 May 2011 20:56:47 +0000 (13:56 -0700)]

Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread

commit | commitdiff | tree

Xavier Ducrohet [Fri, 20 May 2011 20:56:42 +0000 (13:56 -0700)]

Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread

commit | commitdiff | tree

Jaikumar Ganesh [Fri, 20 May 2011 20:37:00 +0000 (13:37 -0700)]

Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."

commit | commitdiff | tree

Jaikumar Ganesh [Fri, 20 May 2011 20:35:20 +0000 (13:35 -0700)]

Merge "BT: Wrong publishing result of bonding error code."

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 20:27:25 +0000 (13:27 -0700)]

am 0a734b18: am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2

* commit '0a734b1894511e833936362820c9e8fec3ca7df3':
Fix 4462497: Move layouts from xlarge to large to enable 7" tablets

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 20:27:00 +0000 (13:27 -0700)]

am ef2b2669: am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2

* commit 'ef2b26695e7fa00419787bb105d448a457e9ed83':
Fix 4462474: Fixes crash on 7" tablet due to using wrong resource

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 20:16:47 +0000 (13:16 -0700)]

am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2

* commit '14e45f9b19a846af074d73b3792e35de0448ac21':
Fix 4462497: Move layouts from xlarge to large to enable 7" tablets

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 20:16:43 +0000 (13:16 -0700)]

am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2

* commit '5e731140f38e06c42885fa300efc30da00711c76':
Fix 4462474: Fixes crash on 7" tablet due to using wrong resource

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 20:13:19 +0000 (13:13 -0700)]

Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 20:12:57 +0000 (13:12 -0700)]

Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2

commit | commitdiff | tree

Adam Powell [Fri, 20 May 2011 20:09:13 +0000 (13:09 -0700)]

am f5abccef: am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2

* commit 'f5abccefb10e8a31363c98d6a8491cb8168b7174':
New opaque cab assets; search dialog tweaks.

commit | commitdiff | tree

Adam Powell [Fri, 20 May 2011 20:04:11 +0000 (13:04 -0700)]

am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2

* commit '73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed':
New opaque cab assets; search dialog tweaks.

commit | commitdiff | tree

Adam Powell [Fri, 20 May 2011 19:59:43 +0000 (12:59 -0700)]

Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2

commit | commitdiff | tree

Gloria Wang [Fri, 20 May 2011 18:02:31 +0000 (11:02 -0700)]

am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.

* commit 'dbfd055d51b51b7a6f412155c2391666efbb638a':
Use pread() to get the decrypted data for container based DRM file. For bug 4392094.

commit | commitdiff | tree

Gloria Wang [Fri, 20 May 2011 17:57:51 +0000 (10:57 -0700)]

am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.

* commit 'a6f1104b9d829c636b60b9387e379f9667b5df09':
Use pread() to get the decrypted data for container based DRM file. For bug 4392094.

commit | commitdiff | tree

Jaikumar Ganesh [Fri, 20 May 2011 17:51:25 +0000 (10:51 -0700)]

am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"

* commit '0c2d82c6f28ab6ec73d66fcc1f62e067829df426':
OBEX: Fix PrivateOutputStream small write problem

commit | commitdiff | tree

Jaikumar Ganesh [Fri, 20 May 2011 17:23:48 +0000 (10:23 -0700)]

am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"

* commit '848a1e3d8522129c8a39d198a10b134926d71bd2':
OBEX: Fix PrivateOutputStream small write problem

commit | commitdiff | tree

Jaikumar Ganesh [Fri, 20 May 2011 16:40:32 +0000 (09:40 -0700)]

Merge "OBEX: Fix PrivateOutputStream small write problem"

commit | commitdiff | tree

satok [Fri, 20 May 2011 13:51:14 +0000 (06:51 -0700)]

am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework

* commit 'd9435bcecc820c8715d8b6b920fd43042418a1e9':
Do not merge. Backport two fixes for InputMethethodFramework

commit | commitdiff | tree

satok [Fri, 20 May 2011 13:41:03 +0000 (06:41 -0700)]

am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework

* commit 'b4788fdbfdda97bd9cfd0e483276934114d9c438':
Do not merge. Backport two fixes for InputMethethodFramework

commit | commitdiff | tree

Dianne Hackborn [Fri, 20 May 2011 02:34:21 +0000 (19:34 -0700)]

am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.

* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
Add new "-swNNNdp" resource qualifier.

commit | commitdiff | tree

Dianne Hackborn [Fri, 20 May 2011 02:30:32 +0000 (19:30 -0700)]

am 69cb8757: Add new "-swNNNdp" resource qualifier.

* commit '69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
Add new "-swNNNdp" resource qualifier.

commit | commitdiff | tree

Dianne Hackborn [Fri, 20 May 2011 01:13:32 +0000 (18:13 -0700)]

Add new "-swNNNdp" resource qualifier.

Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce

commit | commitdiff | tree

Adam Powell [Fri, 20 May 2011 00:17:30 +0000 (17:17 -0700)]

am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2

* commit 'd40575eb983eb7a1d383acc1f30f467374acd085':
DO NOT MERGE Action bar config changes

commit | commitdiff | tree

Adam Powell [Fri, 20 May 2011 00:06:09 +0000 (17:06 -0700)]

am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2

* commit 'b9537db8d9ee27efb4a98415ad2d6b50c1806e5d':
DO NOT MERGE Action bar config changes

commit | commitdiff | tree

Adam Powell [Thu, 19 May 2011 22:48:38 +0000 (15:48 -0700)]

Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2

commit | commitdiff | tree

Irfan Sheriff [Thu, 19 May 2011 22:01:48 +0000 (15:01 -0700)]

am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2

* commit 'a4815c0ec06c293ea9f50b2b925d5a98d11f1143':
Move softap config handling to WifiConfigStore

commit | commitdiff | tree

Irfan Sheriff [Thu, 19 May 2011 21:57:54 +0000 (14:57 -0700)]

am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2

* commit '9c9088a54f6dee7a13dcc7a12297137147b01baa':
Move softap config handling to WifiConfigStore

commit | commitdiff | tree

Irfan Sheriff [Thu, 19 May 2011 21:54:25 +0000 (14:54 -0700)]

Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2

commit | commitdiff | tree

Chet Haase [Thu, 19 May 2011 21:03:04 +0000 (14:03 -0700)]

am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2

* commit 'f0c6ddd99b6770ee4de74ce42134f9f56b8ebc5d':
DO NOT MERGE: Add custom fragment anims for popping backstack

commit | commitdiff | tree

Chet Haase [Thu, 19 May 2011 20:59:06 +0000 (13:59 -0700)]

am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2

* commit '51fb97031f62b1181fc9eb6c636d09a68987d939':
DO NOT MERGE: Add custom fragment anims for popping backstack

commit | commitdiff | tree

Chet Haase [Thu, 19 May 2011 20:57:03 +0000 (13:57 -0700)]

Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2

commit | commitdiff | tree

Kenny Root [Thu, 19 May 2011 19:48:41 +0000 (12:48 -0700)]

Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into honeycomb-plus-aosp

commit | commitdiff | tree

Kenny Root [Thu, 19 May 2011 19:48:14 +0000 (12:48 -0700)]

resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp

Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1

commit | commitdiff | tree

Wink Saville [Thu, 19 May 2011 18:28:36 +0000 (11:28 -0700)]

am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE

* commit 'ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736':
Reset connection while data state changed.

commit | commitdiff | tree

Wink Saville [Thu, 19 May 2011 18:25:45 +0000 (11:25 -0700)]

Merge "Reset connection while data state changed." into honeycomb-LTE

commit | commitdiff | tree

Joe Fernandez [Thu, 19 May 2011 18:06:04 +0000 (11:06 -0700)]

am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1

* commit '605be31c4a80e03dc0af76a73aaa33316ca4a635':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74

commit | commitdiff | tree

Kenny Root [Thu, 19 May 2011 18:04:01 +0000 (11:04 -0700)]

am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread

* commit 'f2006f3123dcdf598e052051041b49c89710b53e':
Break apart queries to getInstalled* API

commit | commitdiff | tree

Joe Fernandez [Thu, 19 May 2011 17:59:16 +0000 (10:59 -0700)]

am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1

* commit '146a0b4522db2d782953a464fe63adcd7e1569c2':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74

commit | commitdiff | tree

Kenny Root [Thu, 19 May 2011 17:55:00 +0000 (10:55 -0700)]

Merge "Break apart queries to getInstalled* API" into gingerbread

commit | commitdiff | tree

Joe Fernandez [Thu, 19 May 2011 17:53:04 +0000 (10:53 -0700)]

am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1

* commit 'fde9ac72668ced2e473ad247cacc8a4bdd05996f':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74

commit | commitdiff | tree

Joe Fernandez [Thu, 19 May 2011 17:49:45 +0000 (10:49 -0700)]

Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1

commit | commitdiff | tree

Mike Lockwood [Thu, 19 May 2011 17:06:44 +0000 (10:06 -0700)]

am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptors

* commit 'ae448e2c90cae096efea53c1c93a70e7b5ca2db7':
USB: Add method to access raw USB device descriptors

commit | commitdiff | tree

Mike Lockwood [Thu, 19 May 2011 17:01:53 +0000 (10:01 -0700)]

am a88b42d5: USB: Add method to access raw USB device descriptors

* commit 'a88b42d569a91290477d8f5731a2ee43931271da':
USB: Add method to access raw USB device descriptors

commit | commitdiff | tree

Adam Powell [Thu, 19 May 2011 02:16:31 +0000 (19:16 -0700)]

am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2

* commit 'd466a4631f3e4f482dd658f42c277d6ad281a9d1':
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.

commit | commitdiff | tree

Adam Powell [Thu, 19 May 2011 02:14:44 +0000 (19:14 -0700)]

am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2

* commit 'b7ec3e41a6b3423d1669ae784a8ad8fbe32df29d':
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.

commit | commitdiff | tree

Adam Powell [Thu, 19 May 2011 02:13:22 +0000 (19:13 -0700)]

Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2

commit | commitdiff | tree

Xavier Ducrohet [Thu, 19 May 2011 00:51:31 +0000 (17:51 -0700)]

am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1

* commit '582841e734bc85b247df64ac85b6ee09f7375f44':
LayoutLib: support the new baseline/margin query API.

commit | commitdiff | tree

Xavier Ducrohet [Thu, 19 May 2011 00:43:27 +0000 (17:43 -0700)]

am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1

* commit 'b18e700cb9c1d7090904449fc6878b8eae1d4693':
LayoutLib: support the new baseline/margin query API.

commit | commitdiff | tree

Xavier Ducrohet [Thu, 19 May 2011 00:40:08 +0000 (17:40 -0700)]

am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1

* commit 'aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0':
LayoutLib: support the new baseline/margin query API.

commit | commitdiff | tree

Xavier Ducrohet [Thu, 19 May 2011 00:36:16 +0000 (17:36 -0700)]

Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1

commit | commitdiff | tree

James Dong [Wed, 18 May 2011 23:33:20 +0000 (16:33 -0700)]

am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2

* commit '380244e9d6c8016bc1a04691a3af0fd999ddf6b0':
Using widevine:// to stream adaptive bitrate wvm content no longer

commit | commitdiff | tree

Robert Greenwalt [Wed, 18 May 2011 23:33:16 +0000 (16:33 -0700)]

am 59b1a4ed: Switch to use netd to add/remove routes.

* commit '59b1a4ede7032c1b4d897e13dd4ede09b5e14743':
Switch to use netd to add/remove routes.

commit | commitdiff | tree

James Dong [Wed, 18 May 2011 23:09:58 +0000 (16:09 -0700)]

am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2

* commit 'd148a499c27145e0473f89ece0500ebed38f875f':
Using widevine:// to stream adaptive bitrate wvm content no longer

commit | commitdiff | tree

James Dong [Wed, 18 May 2011 23:06:14 +0000 (16:06 -0700)]

Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 18 May 2011 22:33:27 +0000 (15:33 -0700)]

Merge 4b999030

Change-Id: Ibb94ba77ec8588f5e7636cf6a038b143e3dcb2bd

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 18 May 2011 22:20:29 +0000 (15:20 -0700)]

am 6c427617: Merge "support humidity sensor type"

* commit '6c427617be940be32fdebbd9c78f9223b292c814':
support humidity sensor type

commit | commitdiff | tree

Dianne Hackborn [Wed, 18 May 2011 22:16:05 +0000 (15:16 -0700)]

am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2

* commit '8416e5cf0a8439a3f605629068d3639f2a35e08b':
Fix fake display size when rotated.

commit | commitdiff | tree

Dianne Hackborn [Wed, 18 May 2011 22:12:07 +0000 (15:12 -0700)]

am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2

* commit '6ad07db7a2c289d036f081eb0c7a666cdb77b548':
Fix fake display size when rotated.

commit | commitdiff | tree

Dianne Hackborn [Wed, 18 May 2011 22:09:58 +0000 (15:09 -0700)]

Merge "Fix fake display size when rotated." into honeycomb-mr2

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 18 May 2011 22:00:11 +0000 (15:00 -0700)]

Merge "support humidity sensor type"

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 18 May 2011 16:52:18 +0000 (09:52 -0700)]

am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."

* commit 'a38762f340853cca5a07732c21e9fb816fd252b8':
MOTOYA changed two kinds of Japanese font files.

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 18 May 2011 16:46:16 +0000 (09:46 -0700)]

am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."

* commit '7ae7d31c2fb06a5c53e71c9e77fa75c8f5777391':
MOTOYA changed two kinds of Japanese font files.

commit | commitdiff | tree

Gloria Wang [Wed, 18 May 2011 16:30:01 +0000 (09:30 -0700)]

am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2

* commit '5a6c3d491ccac07ef3f6a624a8a3e0c36959b661':
DO NOT MERGE For bug 4422428 Squashed commit of the following:

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 18 May 2011 16:24:40 +0000 (09:24 -0700)]

Merge "MOTOYA changed two kinds of Japanese font files."

commit | commitdiff | tree

Gloria Wang [Wed, 18 May 2011 16:19:56 +0000 (09:19 -0700)]

am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2

* commit '07e9267d33bb199d0a2b8de221c64541bdf2465a':
DO NOT MERGE For bug 4422428 Squashed commit of the following:

commit | commitdiff | tree

Gloria Wang [Wed, 18 May 2011 16:17:50 +0000 (09:17 -0700)]

Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2