OSDN Git Service
Xia Wang [Wed, 15 Jun 2011 02:08:22 +0000 (19:08 -0700)]
Merge "Add more opengl benchmark test: - all apps in launcher - shortcuts of apps in home page"
Glenn Kasten [Wed, 15 Jun 2011 00:54:25 +0000 (17:54 -0700)]
Romain Guy [Wed, 15 Jun 2011 00:08:36 +0000 (17:08 -0700)]
Merge "Add TextureView.getBitmap()"
Nick Pelly [Wed, 15 Jun 2011 00:06:54 +0000 (17:06 -0700)]
Merge "minor documentation fixes"
James Dong [Wed, 15 Jun 2011 00:01:11 +0000 (17:01 -0700)]
Merge "Enforce the rule that the timestamp from timelapse video source monotically increases"
James Dong [Wed, 15 Jun 2011 00:00:49 +0000 (17:00 -0700)]
Merge "Update MediaPlayer and MediaRecorder javadoc"
Fabrice Di Meglio [Tue, 14 Jun 2011 23:23:06 +0000 (16:23 -0700)]
Merge "Add View.getResolvedLayoutDirection()"
Robert Ly [Tue, 14 Jun 2011 22:50:38 +0000 (15:50 -0700)]
resolved conflicts for merge of
398d021b to master
Change-Id: I4f8a2cfec95bf31c38365da0257e8d13897bb197
Gloria Wang [Tue, 14 Jun 2011 22:35:11 +0000 (15:35 -0700)]
Merge "To remove log spam in the Forward Lock DRM plugin. Fix for bug
4619159."
Robert Ly [Tue, 14 Jun 2011 22:25:00 +0000 (15:25 -0700)]
am
0b7d7f53: am
b658dfb8: am
cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit '
0b7d7f53a958132eb539fc81130423878c2db650':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
Robert Ly [Tue, 14 Jun 2011 22:22:51 +0000 (15:22 -0700)]
am
ae6dc0c5: am
cbfab050: am
a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
ae6dc0c5e213ce5ca3c504020bc73993e1aceb9a':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Tue, 14 Jun 2011 22:22:47 +0000 (15:22 -0700)]
am
ff46480e: am
4cd4c820: am
9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
ff46480e748555a923242af4238ec8d4822fd2ae':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Wink Saville [Tue, 14 Jun 2011 22:22:42 +0000 (15:22 -0700)]
am
5d47d203: am
fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
* commit '
5d47d203fb60f4e7c91d97fa852a23863861b011':
Enforce provision check for CSIM record only.
Wink Saville [Tue, 14 Jun 2011 22:22:38 +0000 (15:22 -0700)]
am
aad3c3cb: am
c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE
* commit '
aad3c3cbb8d6ceebcf99b80b1567f310b3216d6a':
Make APN re-connect delay configuable
Wink Saville [Tue, 14 Jun 2011 22:22:33 +0000 (15:22 -0700)]
am
46cd4a4b: am
82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
* commit '
46cd4a4bfe432ed6b483c0d6fc1045e387f22710':
Revert "CDMALTE: Get roaming status based on SID/NID"
Mathias Agopian [Tue, 14 Jun 2011 22:22:12 +0000 (15:22 -0700)]
am
9ee39758: (-s ours) am
a9007fbd: am
69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit '
9ee3975883cc4356d7b44f4e86d8c61589d2f42c':
DO NOT MERGE. may fix build on some version of gcc
Dianne Hackborn [Tue, 14 Jun 2011 22:21:18 +0000 (15:21 -0700)]
am
8a73d211: am
74c48f2b: am
700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '
8a73d211845671880b0d50fbb0c5caa065066c80':
Update resources documentation with new qualifiers.
Robert Ly [Tue, 14 Jun 2011 22:13:21 +0000 (15:13 -0700)]
am
5d730c92: am
86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
* commit '
5d730c9237fdf3252a9aa0c01c1653bae69f4f39':
cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
Robert Ly [Tue, 14 Jun 2011 22:10:07 +0000 (15:10 -0700)]
am
86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
* commit '
86ef7977a95d6e1783f646d96992582d1dbf080a':
cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
Robert Ly [Tue, 14 Jun 2011 22:06:42 +0000 (15:06 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
Dianne Hackborn [Tue, 14 Jun 2011 22:05:46 +0000 (15:05 -0700)]
Merge "resolved conflicts for merge of
77fc8b80 to master"
Robert Ly [Tue, 14 Jun 2011 22:04:22 +0000 (15:04 -0700)]
am
b658dfb8: am
cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit '
b658dfb8f4363643b9426649ffc8e48be5c332f6':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
Robert Ly [Tue, 14 Jun 2011 22:02:28 +0000 (15:02 -0700)]
am
cbfab050: am
a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
cbfab050756555a2f7d707522a9d044bcaa4e0c8':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Tue, 14 Jun 2011 22:02:25 +0000 (15:02 -0700)]
am
4cd4c820: am
9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
4cd4c82073a6066bb94cce089cd259d19969c0fd':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Robert Ly [Tue, 14 Jun 2011 22:01:48 +0000 (15:01 -0700)]
am
cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit '
cbd31aec9f4a7367d440bfb0c9683bd481461995':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
Robert Ly [Tue, 14 Jun 2011 21:58:32 +0000 (14:58 -0700)]
Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 21:58:11 +0000 (14:58 -0700)]
am
a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
a91d6552913c02538b3f97e774e9771cfbef9dec':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Tue, 14 Jun 2011 21:58:08 +0000 (14:58 -0700)]
am
9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
9fa54704492234aed15ccdb29aae9261674811e3':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Robert Ly [Tue, 14 Jun 2011 21:56:00 +0000 (14:56 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 21:55:35 +0000 (14:55 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
Wink Saville [Tue, 14 Jun 2011 21:48:51 +0000 (14:48 -0700)]
am
fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
* commit '
fbef26eb55cf8a5b5a25a2b748bf16b54d398abc':
Enforce provision check for CSIM record only.
Wink Saville [Tue, 14 Jun 2011 21:47:07 +0000 (14:47 -0700)]
am
c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE
* commit '
c2d17d3bea02991df378237ea7058ccedb7c6a14':
Make APN re-connect delay configuable
Wink Saville [Tue, 14 Jun 2011 21:47:04 +0000 (14:47 -0700)]
am
82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
* commit '
82c1a5dea305d56eb77efa7d9a730307ff6af28a':
Revert "CDMALTE: Get roaming status based on SID/NID"
Wink Saville [Tue, 14 Jun 2011 21:44:31 +0000 (14:44 -0700)]
Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
Wink Saville [Tue, 14 Jun 2011 21:44:23 +0000 (14:44 -0700)]
Merge "Make APN re-connect delay configuable" into honeycomb-LTE
Wink Saville [Tue, 14 Jun 2011 21:44:12 +0000 (14:44 -0700)]
Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
Jamie Gennis [Tue, 14 Jun 2011 21:15:11 +0000 (14:15 -0700)]
Merge changes I47f147f8,Id09915c9,Iabc6d27c
* changes:
SurfaceTexture: increase the test's Surface layer.
SurfaceTexture: add some RGBA_8888 tests.
SurfaceTextureClient: minor test refactoring.
Adam Powell [Tue, 14 Jun 2011 20:47:45 +0000 (13:47 -0700)]
Merge "Fix bug
4551701 - com.android.browser: java.lang.IllegalStateException"
Jamie Gennis [Tue, 14 Jun 2011 02:06:52 +0000 (19:06 -0700)]
SurfaceTexture: increase the test's Surface layer.
This change increases the Surface layer used for displaying the test
results so that the tests will be visible over other windows in the
system.
Change-Id: I47f147f8743ff2a39d57d551811668371202bd31
Jamie Gennis [Thu, 17 Mar 2011 23:32:52 +0000 (16:32 -0700)]
SurfaceTexture: add some RGBA_8888 tests.
Change-Id: Id09915c98a00eca1209b7dab32039a06d260908e
Jamie Gennis [Wed, 6 Apr 2011 22:43:16 +0000 (15:43 -0700)]
SurfaceTextureClient: minor test refactoring.
Change-Id: Iabc6d27ca35d30d896c6aef65c4f1b5a1eed47b8
Doug Zongker [Tue, 14 Jun 2011 20:39:36 +0000 (13:39 -0700)]
Merge "deprecate RADIO constant, add getRadioVersion method"
Jamie Gennis [Tue, 14 Jun 2011 20:39:05 +0000 (13:39 -0700)]
Merge "SurfaceTexture: add a format querying test."
Mathias Agopian [Tue, 14 Jun 2011 20:30:34 +0000 (13:30 -0700)]
am
a9007fbd: am
69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit '
a9007fbdae6671f66535da4b9dad04b19aaf9186':
DO NOT MERGE. may fix build on some version of gcc
Mathias Agopian [Tue, 14 Jun 2011 20:26:38 +0000 (13:26 -0700)]
am
69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit '
69b4587bfbb3e98f793959d9123340360fa233a2':
DO NOT MERGE. may fix build on some version of gcc
RoboErik [Tue, 14 Jun 2011 20:24:40 +0000 (13:24 -0700)]
Merge "Rename Calendar.java to CalendarContract.java"
Alex Sakhartchouk [Tue, 14 Jun 2011 20:14:57 +0000 (13:14 -0700)]
Merge "Allocation copy functions."
Dianne Hackborn [Tue, 14 Jun 2011 19:17:35 +0000 (12:17 -0700)]
resolved conflicts for merge of
77fc8b80 to master
Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d
Mathias Agopian [Tue, 14 Jun 2011 18:50:22 +0000 (11:50 -0700)]
DO NOT MERGE. may fix build on some version of gcc
Change-Id: Iff6d9ab3a7caf58f65fc3f60633a3bd577b7af25
Mathias Agopian [Tue, 14 Jun 2011 18:51:24 +0000 (11:51 -0700)]
Merge "may fix build on some version of gcc"
Mathias Agopian [Tue, 14 Jun 2011 18:50:22 +0000 (11:50 -0700)]
may fix build on some version of gcc
Change-Id: Ia88787c0432ec84d51fe505fd6a2b6f98ebe8f33
Dianne Hackborn [Tue, 14 Jun 2011 18:42:09 +0000 (11:42 -0700)]
am
74c48f2b: am
700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '
74c48f2b2b7084e1bfddb2dddf7587b0cf821ea6':
Update resources documentation with new qualifiers.
Dianne Hackborn [Tue, 14 Jun 2011 18:40:06 +0000 (11:40 -0700)]
am
6c0533f9: am
c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit '
6c0533f994e7991b3bd60cab48362e8e2e6d86f0':
Add new landscape and portrait orientation features.
Dianne Hackborn [Tue, 14 Jun 2011 18:38:01 +0000 (11:38 -0700)]
am
700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '
700a1f25719138b94c453beb6325e627a11a9883':
Update resources documentation with new qualifiers.
Dianne Hackborn [Tue, 14 Jun 2011 18:36:05 +0000 (11:36 -0700)]
am
c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit '
c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
Add new landscape and portrait orientation features.
Daisuke Miyakawa [Tue, 14 Jun 2011 18:30:47 +0000 (11:30 -0700)]
Merge "Fix commment"
Dianne Hackborn [Tue, 14 Jun 2011 18:27:09 +0000 (11:27 -0700)]
Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
Dianne Hackborn [Tue, 14 Jun 2011 18:24:29 +0000 (11:24 -0700)]
Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
tedbo [Tue, 14 Jun 2011 18:18:30 +0000 (11:18 -0700)]
Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink."
Chia-chi Yeh [Tue, 14 Jun 2011 17:58:20 +0000 (10:58 -0700)]
Merge "VPN: do not allow zero prefix length in routing rules."
Chia-chi Yeh [Tue, 14 Jun 2011 17:58:10 +0000 (10:58 -0700)]
Merge "VPN: do not use gateway in routing rules."
Glenn Kasten [Tue, 14 Jun 2011 17:35:34 +0000 (10:35 -0700)]
Bug
4608375
Update priority and policy together for audio threads
Change-Id: Ib3b07b32586c222c4aacbf23414ae8b05db502be
RoboErik [Tue, 14 Jun 2011 17:27:12 +0000 (10:27 -0700)]
Merge "Update Calendar main comment"
John Wang [Tue, 14 Jun 2011 17:17:51 +0000 (10:17 -0700)]
am
aabe5f46: am
49572479: Update sim missing message in lock screen.
* commit '
aabe5f46846a45163be874dca2d19910ce38c232':
Update sim missing message in lock screen.
Gloria Wang [Tue, 14 Jun 2011 17:05:55 +0000 (10:05 -0700)]
Merge "Duplicated fileDesc is not closed when input file is not forward-lock content. Fix for bug
4606053."
John Wang [Tue, 14 Jun 2011 17:05:40 +0000 (10:05 -0700)]
am
49572479: Update sim missing message in lock screen.
* commit '
49572479a9cb479f2b323f011c1a9f8142ec1a46':
Update sim missing message in lock screen.
Mike J. Chen [Tue, 14 Jun 2011 16:53:23 +0000 (09:53 -0700)]
Merge "Handle always present wired ethernet interfaces at boot."
Narayan Kamath [Tue, 14 Jun 2011 14:05:42 +0000 (07:05 -0700)]
Merge "A few TTS bug fixes"
Mathias Agopian [Tue, 14 Jun 2011 04:14:17 +0000 (21:14 -0700)]
Merge "cleanup Kalman filter parameters, add/fix comments/units"
Jeff Brown [Tue, 14 Jun 2011 03:30:09 +0000 (20:30 -0700)]
Merge "Allow touches to slide out of the navigation bar."
Mike Lockwood [Tue, 14 Jun 2011 02:50:37 +0000 (19:50 -0700)]
Merge "Settings: Remove unused USE_PTP_INTERFACE setting"
Dima Zavin [Tue, 14 Jun 2011 02:43:59 +0000 (19:43 -0700)]
Merge "audio: update for audio/audio_policy header names/locations"
Mike Lockwood [Tue, 14 Jun 2011 02:22:29 +0000 (19:22 -0700)]
Merge "Move adb related functionality from SystemServer and NotificationManagerService to UsbDeviceManager"
Romain Guy [Tue, 14 Jun 2011 02:07:22 +0000 (19:07 -0700)]
Merge "Batch glCopyTexImage() calls to get about 15 fps back on SGX."
James Dong [Tue, 14 Jun 2011 01:47:20 +0000 (18:47 -0700)]
Merge "Add an option to force to use HW codec in stagefright cmd tool"
James Dong [Tue, 14 Jun 2011 01:47:03 +0000 (18:47 -0700)]
Merge "Add B frame support for MPEG4Writer"
Adam Powell [Tue, 14 Jun 2011 01:45:40 +0000 (18:45 -0700)]
Merge "Expose api on View to determine if the view can be scrolled."
Mathias Agopian [Tue, 14 Jun 2011 01:44:20 +0000 (18:44 -0700)]
Merge "fix RefBase so it retains binary-compatibility with gingerbread"
Jeff Brown [Tue, 14 Jun 2011 01:41:20 +0000 (18:41 -0700)]
Merge "Mimic Zygote preload steps when using wrappers."
Jeff Brown [Tue, 14 Jun 2011 01:40:50 +0000 (18:40 -0700)]
Merge "Take advantage of updated linux/input.h kernel headers."
Mathias Agopian [Mon, 13 Jun 2011 01:05:53 +0000 (18:05 -0700)]
fix RefBase so it retains binary-compatibility with gingerbread
Bug:
4595257
Change-Id: I0d5e10f497e3f39868bff58f6ded510c38b44b12
David Brown [Tue, 14 Jun 2011 01:11:16 +0000 (18:11 -0700)]
Merge "Add "geoDescription" to CallerInfo"
Mathias Agopian [Tue, 14 Jun 2011 00:20:53 +0000 (17:20 -0700)]
Merge changes I9b8e1962,I7bb843ca
* changes:
Temporarily don't return the current buffer in synchronous mode
unify SurfaceTexture and Surface
Steve Block [Tue, 14 Jun 2011 00:17:11 +0000 (17:17 -0700)]
Merge "Fix thread violation in WebView.getViewHeight()"
Gilles Debunne [Tue, 14 Jun 2011 00:09:12 +0000 (17:09 -0700)]
Merge "Switch is not affected by touch when disabled"
Chia-chi Yeh [Mon, 13 Jun 2011 23:17:03 +0000 (16:17 -0700)]
Merge "VPN: tolerate duplicated routes."
Chia-chi Yeh [Mon, 13 Jun 2011 23:11:58 +0000 (16:11 -0700)]
Merge "VPN: fix a bad optimization of zeroing ifr_flags lately."
Mathias Agopian [Thu, 5 May 2011 01:28:07 +0000 (18:28 -0700)]
Temporarily don't return the current buffer in synchronous mode
activate synchronous mode by default.
Mathias Agopian [Wed, 20 Apr 2011 21:20:59 +0000 (14:20 -0700)]
unify SurfaceTexture and Surface
Add the concept of synchronous dequeueBuffer in SurfaceTexture
Implement {Surface|SurfaceTextureClient}::setSwapInterval()
Add SurfaceTexture logging
fix onFrameAvailable
Derek Sollenberger [Mon, 13 Jun 2011 22:42:47 +0000 (15:42 -0700)]
am
f11c52d2: Updates resulting from the Skia merge (revision 1327)
* commit '
f11c52d246d9e43c8533dff82979e7eeb72c1d50':
Updates resulting from the Skia merge (revision 1327)
Mathias Agopian [Mon, 13 Jun 2011 22:42:26 +0000 (15:42 -0700)]
am
c031afc8: (-s ours) am
77079399: am
a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
c031afc8e9ad6c940c7d67a15b9c53092987377e':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Jean-Baptiste Queru [Mon, 13 Jun 2011 22:42:10 +0000 (15:42 -0700)]
am
c793f521: Merge/Ignore
653fd9cf
* commit '
c793f521e5ace1dca39d65de3ed60d7c8242f661':
Moving flag to a member field instead of a stack variable.
Dan Morrill [Mon, 13 Jun 2011 22:41:56 +0000 (15:41 -0700)]
am
74e646ca: (-s ours) Fix merge conflict for \'
c2e1e329\'.
* commit '
74e646cab9a28aa3716a05fc474853c2c557f942':
Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it.
Chia-chi Yeh [Mon, 13 Jun 2011 22:38:20 +0000 (15:38 -0700)]
Merge "VPN: set IFF_NO_PI on TUN interface."
Chia-chi Yeh [Mon, 13 Jun 2011 22:08:43 +0000 (15:08 -0700)]
Merge "VPN: add MTU support."
Jamie Gennis [Sun, 12 Jun 2011 20:56:15 +0000 (13:56 -0700)]
SurfaceTexture: add a format querying test.
This change adds a test to verify that querying the format of a
SurfaceTextureClient immediately after setting it returns the correct
result. The test is currently disabled because it does not pass.
Change-Id: I5bddb39c5bf96d6104624094383d410ed913e9f3
Jamie Gennis [Mon, 13 Jun 2011 21:48:11 +0000 (14:48 -0700)]
Merge changes Ic9186db2,Id5a7cdff
* changes:
SurfaceTexture: disable a deadlocking test.
SurfaceTexture: add a pixel tolerance to the tests.
Chia-chi Yeh [Mon, 13 Jun 2011 21:35:12 +0000 (14:35 -0700)]
Merge "VPN: use ParcelFileDescriptor.adoptFd() instead of doing it in JNI."
Svetoslav Ganov [Mon, 13 Jun 2011 21:30:30 +0000 (14:30 -0700)]
Merge "Final polish of the interrogation feature."
Mathias Agopian [Mon, 13 Jun 2011 21:15:00 +0000 (14:15 -0700)]
am
77079399: am
a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
77079399fca3e9c71e2ac06f3da26934e1c278b9':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)