OSDN Git Service
Jim Miller [Mon, 7 Nov 2011 22:29:08 +0000 (22:29 +0000)]
am
4d8ecc65: Merge "Fix
5231823: PIN/Password polish on lock screen" into ics-mr1
* commit '
4d8ecc65c5a747f350492b21397d7466ff628900':
Fix
5231823: PIN/Password polish on lock screen
Jim Miller [Mon, 7 Nov 2011 22:24:43 +0000 (14:24 -0800)]
Merge "Fix
5231823: PIN/Password polish on lock screen" into ics-mr1
Jeff Brown [Mon, 7 Nov 2011 22:05:22 +0000 (14:05 -0800)]
Merge "Fix possible leak in Parcel::writeDupFileDescriptor."
Peter Ng [Mon, 7 Nov 2011 21:44:33 +0000 (21:44 +0000)]
am
a50c859d: Merge "Color balancing framework assets" into ics-mr1
* commit '
a50c859d3f071b9d405bf461e34f11d40f20561e':
Color balancing framework assets
Peter Ng [Mon, 7 Nov 2011 21:40:45 +0000 (13:40 -0800)]
Merge "Color balancing framework assets" into ics-mr1
Eric Fischer [Mon, 7 Nov 2011 20:41:00 +0000 (20:41 +0000)]
am
08be43a6: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
08be43a6d912fe1f34596d5e90df6b497424af02':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Nov 2011 20:36:02 +0000 (12:36 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Jeff Brown [Sat, 5 Nov 2011 03:19:33 +0000 (20:19 -0700)]
Fix possible leak in Parcel::writeDupFileDescriptor.
Also, check the result of dup() just in case we got EMFILE
or something.
Change-Id: I18e627bd84f4c7941813fe1c2bad2cdd9e5afa83
Amith Yamasani [Mon, 7 Nov 2011 19:01:22 +0000 (19:01 +0000)]
am
7919bfb1: Merge "Don\'t show the submit button when it isn\'t enabled." into ics-mr1
* commit '
7919bfb12365b3f84e232235c35df957039995b7':
Don't show the submit button when it isn't enabled.
Amith Yamasani [Mon, 7 Nov 2011 18:57:17 +0000 (10:57 -0800)]
Merge "Don't show the submit button when it isn't enabled." into ics-mr1
Winson Chung [Mon, 7 Nov 2011 18:24:01 +0000 (18:24 +0000)]
am
19c86cac: Merge "Fixing screenshot border asset." into ics-mr1
* commit '
19c86cacb2f0ba04cc93084ba474662afb17d88f':
Fixing screenshot border asset.
Winson Chung [Mon, 7 Nov 2011 18:20:37 +0000 (10:20 -0800)]
Merge "Fixing screenshot border asset." into ics-mr1
Daniel Sandler [Mon, 7 Nov 2011 18:15:30 +0000 (18:15 +0000)]
am
010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1
* commit '
010bb273a58444f907bb82f62f8d7274f9637b49':
Offer the user an option to launch Dreams when docked.
Teach UiModeMgr about high-end and low-end desk docks.
Daniel Sandler [Mon, 7 Nov 2011 18:11:52 +0000 (10:11 -0800)]
Merge changes I0da0f04f,I93197665 into ics-mr1
* changes:
Offer the user an option to launch Dreams when docked.
Teach UiModeMgr about high-end and low-end desk docks.
Alex Sakhartchouk [Mon, 7 Nov 2011 17:53:28 +0000 (09:53 -0800)]
Merge "Properly passing an unused variable through."
The Android Open Source Project [Mon, 7 Nov 2011 16:30:54 +0000 (08:30 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib022135d56532756d171af770d4fae4e94402d9b
The Android Open Source Project [Mon, 7 Nov 2011 16:28:26 +0000 (16:28 +0000)]
am
064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
064975c27cbca412e682fa152ce00af14027ab4f':
Fix a leak in Parcel::writeBlob.
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
The Android Open Source Project [Mon, 7 Nov 2011 16:22:56 +0000 (08:22 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
Dianne Hackborn [Mon, 7 Nov 2011 15:51:38 +0000 (15:51 +0000)]
am
6581043a: am
7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
* commit '
6581043a44ab46a47f09080eeb7c9fc9d0a2d0c0':
Print out memory info when we get into a low memory situation.
Mathias Agopian [Mon, 7 Nov 2011 15:51:33 +0000 (15:51 +0000)]
am
3f24589e: Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1
* commit '
3f24589edd860618ccf65d6653b002d13810e78b':
workaround to set the WM refresh rate to 48 Hz for tuna devices only
Jeff Brown [Mon, 7 Nov 2011 15:51:31 +0000 (15:51 +0000)]
am
88061d6b: am
5462bc63: Fix a leak in Parcel::writeBlob.
* commit '
88061d6b38cfb4bf374039846b753a3b21ac61e1':
Fix a leak in Parcel::writeBlob.
Steve Block [Mon, 7 Nov 2011 15:37:53 +0000 (07:37 -0800)]
Merge changes If1bdd547,Ie43c16ae,I62b45f8b,I32b7fdc0
* changes:
Add tests for the fields of objects in the WebView's Java Bridge.
Adds a set of basic test for WebView's Java Bridge
Add tests for returning values from WebView's Java Bridge
Adds a new test for type coercion in WebView's Java Bridge
The Android Automerger [Sun, 6 Nov 2011 14:46:10 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sun, 6 Nov 2011 14:28:19 +0000 (06:28 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Romain Guy [Sat, 5 Nov 2011 19:33:49 +0000 (19:33 +0000)]
am
2ccc47b8: Merge "Memory optimizations for libhwui Bug #
5566149" into ics-mr1
* commit '
2ccc47b89868d4f39683e0e2bd057ce95d7d1217':
Memory optimizations for libhwui Bug #
5566149
Robert Greenwalt [Sat, 5 Nov 2011 19:33:46 +0000 (19:33 +0000)]
am
fd900f05: am
348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit '
fd900f05fb67046b97701f20626f7fd408fd8990':
Start using IP tool for advanced routing.
Jamie Gennis [Sat, 5 Nov 2011 19:33:42 +0000 (19:33 +0000)]
am
2ab7ec90: Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1
* commit '
2ab7ec90e4a6f21bee7cbfebbd751d32d4cf9e03':
EGL: Add stubs for EGL_ANDROID_blob_cache
Dianne Hackborn [Sat, 5 Nov 2011 19:33:39 +0000 (19:33 +0000)]
am
960177ae: (-s ours) am
ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
* commit '
960177ae394a466d765a2dc171e136f9fdea06b6':
DO NOT MERGE. Integrate: Include showmap output in bug report.
Dave Burke [Sat, 5 Nov 2011 19:33:33 +0000 (19:33 +0000)]
am
a3af4c94: am
3ee47188: Frame rate to 48 fps
* commit '
a3af4c94dfbf3336004a38011f6453bfcd7fd638':
Frame rate to 48 fps
Mathias Agopian [Sat, 5 Nov 2011 19:33:18 +0000 (19:33 +0000)]
am
515c6b44: Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1
* commit '
515c6b44d57b829792267594a355cd2831582197':
fix an issue where SensorService could request an invalid sensor delay
Irfan Sheriff [Sat, 5 Nov 2011 19:33:16 +0000 (19:33 +0000)]
am
45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1
* commit '
45a04db3f95755829b24043d30d7da7182b4f33b':
Avoid quick shutdown after a driver start
Narayan Kamath [Sat, 5 Nov 2011 19:33:11 +0000 (19:33 +0000)]
am
eaa17b76: Merge "Add an API for querying / enabling network TTS support." into ics-mr1
* commit '
eaa17b768fcd2624cb5d46a76ade24ebe7e56957':
Add an API for querying / enabling network TTS support.
Chet Haase [Sat, 5 Nov 2011 19:01:51 +0000 (12:01 -0700)]
resolved conflicts for merge of
aa4d2f69 to master
Change-Id: Iadb63ecf52d8bd2911276fa3db55a43c9c378620
Dianne Hackborn [Sat, 5 Nov 2011 16:40:10 +0000 (16:40 +0000)]
am
55fe6763: Merge "Include showmap output in bug report." into ics-mr1
* commit '
55fe6763d29cb0e899b2541497f4d8bc1bbd14ba':
Include showmap output in bug report.
Amith Yamasani [Sat, 5 Nov 2011 16:40:07 +0000 (16:40 +0000)]
am
d69c203c: Merge "Close suggestions cursor when SearchView is detached." into ics-mr1
* commit '
d69c203cd48c1d0d3be92fb0396656ee8adc1185':
Close suggestions cursor when SearchView is detached.
Flavio Lerda [Sat, 5 Nov 2011 16:40:01 +0000 (16:40 +0000)]
am
8f7d88cc: Merge "Add a query parameter to look-up a SIP address." into ics-mr1
* commit '
8f7d88cc67e1c89c960b932ceafc60d378aa2ad6':
Add a query parameter to look-up a SIP address.
Eric Laurent [Sat, 5 Nov 2011 16:32:35 +0000 (09:32 -0700)]
resolved conflicts for merge of
914972be to master
Change-Id: I15adb9040eaa206c31bb5a08ed5ee5b32967ba0a
Eric Laurent [Sat, 5 Nov 2011 15:56:06 +0000 (08:56 -0700)]
Merge "resolved conflicts for merge of
79178b8b to master"
Eric Laurent [Sat, 5 Nov 2011 15:52:20 +0000 (08:52 -0700)]
resolved conflicts for merge of
79178b8b to master
Change-Id: Ia597549a6d159b86063eb3afec5ce7fe98434a65
Dianne Hackborn [Sat, 5 Nov 2011 07:34:03 +0000 (07:34 +0000)]
am
7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
* commit '
7311bd4b709750384b058d8e988e2e983c97b3f2':
Print out memory info when we get into a low memory situation.
The Android Automerger [Sat, 5 Nov 2011 07:33:21 +0000 (00:33 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Dianne Hackborn [Sat, 5 Nov 2011 07:31:17 +0000 (00:31 -0700)]
Merge "Print out memory info when we get into a low memory situation." into ics-mr0
Jeff Brown [Sat, 5 Nov 2011 02:01:44 +0000 (19:01 -0700)]
Fix a leak in Parcel::writeBlob.
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in. It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.
Bug:
5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
Jeff Brown [Sat, 5 Nov 2011 03:06:42 +0000 (20:06 -0700)]
Merge "Slight change to the unwinder API."
Mathias Agopian [Sat, 5 Nov 2011 02:57:59 +0000 (19:57 -0700)]
Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1
Jeff Brown [Sat, 5 Nov 2011 02:35:57 +0000 (02:35 +0000)]
am
5462bc63: Fix a leak in Parcel::writeBlob.
* commit '
5462bc6318b4b70e7a58c66994e2bd79f59d9739':
Fix a leak in Parcel::writeBlob.
Jeff Brown [Sat, 5 Nov 2011 02:01:44 +0000 (19:01 -0700)]
Fix a leak in Parcel::writeBlob.
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in. It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.
Bug:
5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
Mathias Agopian [Sat, 5 Nov 2011 01:46:11 +0000 (18:46 -0700)]
workaround to set the WM refresh rate to 48 Hz for tuna devices only
this is TEMPORARY until we can do this properly.
Bug:
5572464
Change-Id: I6537706d636a83a4a50e2900d6b829dd89b6f245
Romain Guy [Fri, 4 Nov 2011 23:35:35 +0000 (16:35 -0700)]
Merge "Memory optimizations for libhwui Bug #
5566149" into ics-mr1
Robert Greenwalt [Fri, 4 Nov 2011 22:55:30 +0000 (22:55 +0000)]
am
348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit '
348297abc0e03fb87a1d22465020b580d83fdd61':
Start using IP tool for advanced routing.
Robert Greenwalt [Fri, 4 Nov 2011 22:53:37 +0000 (15:53 -0700)]
Merge "Start using IP tool for advanced routing." into ics-mr0
The Android Automerger [Fri, 4 Nov 2011 22:40:13 +0000 (15:40 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jamie Gennis [Fri, 4 Nov 2011 22:10:11 +0000 (15:10 -0700)]
Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1
Jamie Gennis [Fri, 4 Nov 2011 00:42:43 +0000 (17:42 -0700)]
EGL: Add stubs for EGL_ANDROID_blob_cache
This change adds a stub cache implementation that gets passed to the
underlying EGL implementation at initialization time.
Change-Id: I14437c5b6f91b7a34a19bb02ad802e6e54f88d2a
Dianne Hackborn [Fri, 4 Nov 2011 21:01:40 +0000 (21:01 +0000)]
am
ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
* commit '
ca25016775391bf71f7503aeb61798df46fa54cf':
DO NOT MERGE. Integrate: Include showmap output in bug report.
Dianne Hackborn [Fri, 4 Nov 2011 21:00:21 +0000 (14:00 -0700)]
Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
Dave Burke [Fri, 4 Nov 2011 20:55:30 +0000 (20:55 +0000)]
am
3ee47188: Frame rate to 48 fps
* commit '
3ee471889b09d90affddd00c409a515a64b6861b':
Frame rate to 48 fps
Mathias Agopian [Fri, 4 Nov 2011 19:13:36 +0000 (12:13 -0700)]
Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1
Irfan Sheriff [Fri, 4 Nov 2011 18:47:27 +0000 (11:47 -0700)]
Merge "Avoid quick shutdown after a driver start" into ics-mr1
Narayan Kamath [Fri, 4 Nov 2011 18:01:57 +0000 (11:01 -0700)]
Merge "Add an API for querying / enabling network TTS support." into ics-mr1
Chet Haase [Fri, 4 Nov 2011 18:01:25 +0000 (11:01 -0700)]
Merge "Improve Launcher drag performance." into ics-mr1
Dianne Hackborn [Fri, 4 Nov 2011 17:46:09 +0000 (10:46 -0700)]
Merge "Include showmap output in bug report." into ics-mr1
Amith Yamasani [Fri, 4 Nov 2011 17:41:10 +0000 (10:41 -0700)]
Merge "Close suggestions cursor when SearchView is detached." into ics-mr1
Flavio Lerda [Fri, 4 Nov 2011 16:48:18 +0000 (09:48 -0700)]
Merge "Add a query parameter to look-up a SIP address." into ics-mr1
Eric Laurent [Fri, 4 Nov 2011 15:29:30 +0000 (08:29 -0700)]
Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1
Eric Laurent [Fri, 4 Nov 2011 15:27:45 +0000 (08:27 -0700)]
Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1
The Android Open Source Project [Fri, 4 Nov 2011 15:01:30 +0000 (15:01 +0000)]
am
8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
8242cc49a90aa13a4830a735438b6e3cf73ea0f0':
Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
The Android Open Source Project [Fri, 4 Nov 2011 14:56:42 +0000 (07:56 -0700)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I81cf3b3994cb9a1c18fca3ce0049e09402543086
Wink Saville [Fri, 4 Nov 2011 12:04:09 +0000 (12:04 +0000)]
Dave Burke [Fri, 4 Nov 2011 12:04:08 +0000 (12:04 +0000)]
am
43e72b1f: (-s ours) am
32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '
43e72b1f5692dd9e220158001317c2abc0ecafcf':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Wink Saville [Fri, 4 Nov 2011 12:04:06 +0000 (12:04 +0000)]
am
8b771243: am
3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0
* commit '
8b77124395713de5e09c9b56fac03c244513dc25':
Separate data stall detection and recovery from net stats.
Wink Saville [Fri, 4 Nov 2011 11:59:29 +0000 (11:59 +0000)]
Dave Burke [Fri, 4 Nov 2011 11:59:27 +0000 (11:59 +0000)]
am
32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '
32b5a7eeaf758fad0c24131603cdd54cd2883a58':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Wink Saville [Fri, 4 Nov 2011 11:59:25 +0000 (11:59 +0000)]
am
3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0
* commit '
3d7084519b03da0681da13fb8d7d4a0914d11646':
Separate data stall detection and recovery from net stats.
Katie McCormick [Fri, 4 Nov 2011 11:34:16 +0000 (11:34 +0000)]
am
6d77ad80: am
6c5951bf: Doc change: Updating device-admin with camera info.
* commit '
6d77ad80375a82b97aefb7d5ab547a2944135edf':
Doc change: Updating device-admin with camera info.
Katie McCormick [Fri, 4 Nov 2011 11:28:39 +0000 (11:28 +0000)]
am
6c5951bf: Doc change: Updating device-admin with camera info.
* commit '
6c5951bf9798369d335096f1f73ee1299cf903ff':
Doc change: Updating device-admin with camera info.
Ken Wakasa [Fri, 4 Nov 2011 08:05:44 +0000 (08:05 +0000)]
am
943f6d0b: Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1
* commit '
943f6d0b33f599ed00b76c59b4a4b4c41d0e66f2':
Turn off the spell checker when the spell checker is disabled in the settings
Ken Wakasa [Fri, 4 Nov 2011 08:02:12 +0000 (01:02 -0700)]
Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1
Dave Burke [Fri, 4 Nov 2011 04:59:20 +0000 (21:59 -0700)]
Merge "DO NOT MERGE Poll input data with a small timeout and don't consume a full core." into ics-mr0
Wink Saville [Fri, 4 Nov 2011 04:26:35 +0000 (21:26 -0700)]
Merge "Separate data stall detection and recovery from net stats." into ics-mr0
Jeff Brown [Fri, 4 Nov 2011 00:30:54 +0000 (17:30 -0700)]
Slight change to the unwinder API.
Change-Id: I5424de76a21b74842e004e0281936b3f492d3c7a
Irfan Sheriff [Thu, 3 Nov 2011 23:10:04 +0000 (23:10 +0000)]
am
a3d9eba1: Merge "Reset IP failure counter on a success" into ics-mr1
* commit '
a3d9eba10461158a52acfc2a0324696b25db761f':
Reset IP failure counter on a success
Irfan Sheriff [Thu, 3 Nov 2011 23:06:07 +0000 (16:06 -0700)]
Merge "Reset IP failure counter on a success" into ics-mr1
Christopher Tate [Thu, 3 Nov 2011 23:04:43 +0000 (23:04 +0000)]
am
4fdad1af: Merge "Add persistent property to disable strict mode" into ics-mr1
* commit '
4fdad1af53ea46892f477185ff93d4182b7aadf9':
Add persistent property to disable strict mode
Christopher Tate [Thu, 3 Nov 2011 22:59:47 +0000 (15:59 -0700)]
Merge "Add persistent property to disable strict mode" into ics-mr1
Mangesh Ghiware [Thu, 3 Nov 2011 22:40:56 +0000 (22:40 +0000)]
am
69957172: Merge "Update fix to restore view and text wrap scales." into ics-mr1
* commit '
69957172fa8336e01a9ff07ab34deca2c553f0b4':
Update fix to restore view and text wrap scales.
Mangesh Ghiware [Thu, 3 Nov 2011 22:35:23 +0000 (15:35 -0700)]
Merge "Update fix to restore view and text wrap scales." into ics-mr1
Dianne Hackborn [Thu, 3 Nov 2011 22:19:36 +0000 (22:19 +0000)]
am
e0ad4746: Merge "Some optimizations for view inflation." into ics-mr1
* commit '
e0ad47465ededb16c6cd60524acd6941a8ce0bd8':
Some optimizations for view inflation.
Dianne Hackborn [Thu, 3 Nov 2011 22:16:11 +0000 (15:16 -0700)]
Merge "Some optimizations for view inflation." into ics-mr1
Kenny Root [Thu, 3 Nov 2011 21:51:15 +0000 (21:51 +0000)]
am
e24ac4b2: Merge "Update GET_UNINSTALLED_PACKAGES flag documentation" into ics-mr1
* commit '
e24ac4b219a582f1a99465551b1fd76345553b22':
Update GET_UNINSTALLED_PACKAGES flag documentation
Kenny Root [Thu, 3 Nov 2011 21:47:07 +0000 (14:47 -0700)]
Merge "Update GET_UNINSTALLED_PACKAGES flag documentation" into ics-mr1
Scott Main [Thu, 3 Nov 2011 21:10:49 +0000 (21:10 +0000)]
am
cbf1437c: am
95142919: docs: dashboard update for 11/3
* commit '
cbf1437c9dc3080d4faa79be8612c3ef7387515e':
docs: dashboard update for 11/3
Scott Main [Thu, 3 Nov 2011 21:06:29 +0000 (21:06 +0000)]
am
95142919: docs: dashboard update for 11/3
* commit '
9514291901e3a1274e30c2e809ad38e22e7f662e':
docs: dashboard update for 11/3
Marco Nelissen [Thu, 3 Nov 2011 20:18:37 +0000 (20:18 +0000)]
am
f51f1bd9: Verify we actually have valid utf8 metadata
* commit '
f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca':
Verify we actually have valid utf8 metadata
Jamie Gennis [Thu, 3 Nov 2011 18:57:21 +0000 (18:57 +0000)]
am
c5ce130f: Merge "SurfaceTexture: various logging improvements" into ics-mr1
* commit '
c5ce130f658303299bf55091373951f7fd33ae36':
SurfaceTexture: various logging improvements
Jamie Gennis [Thu, 3 Nov 2011 18:55:14 +0000 (18:55 +0000)]
am
236aea35: Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1
* commit '
236aea3579787961fdd41d87574760b63323c0c1':
BlobCache: implement cache serialization
BlobCache: remove the mutex locking
Jamie Gennis [Thu, 3 Nov 2011 18:51:38 +0000 (11:51 -0700)]
Merge "SurfaceTexture: various logging improvements" into ics-mr1
Jamie Gennis [Thu, 3 Nov 2011 18:51:23 +0000 (11:51 -0700)]
Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1
* changes:
BlobCache: implement cache serialization
BlobCache: remove the mutex locking
Jeff Sharkey [Thu, 3 Nov 2011 18:49:05 +0000 (18:49 +0000)]
am
3f9ce4c2: Merge "Verify AppWidget ownership during update." into ics-mr1
* commit '
3f9ce4c22ae9b4f0f2208c29f8c93d6ad652a1dc':
Verify AppWidget ownership during update.
Teng-Hui Zhu [Thu, 3 Nov 2011 18:46:41 +0000 (18:46 +0000)]
am
76b06759: Merge "Create GL texture when it is missing for video layer" into ics-mr1
* commit '
76b067590b2e9dc403c9edac58e414468c5e1104':
Create GL texture when it is missing for video layer