Commit Graph

41663 Commits

Author SHA1 Message Date
Jason Sams
286b9ba2e1 Merge "Fix script init error handling." 2011-11-22 16:05:48 -08:00
The Android Open Source Project
bcf7af299d am d49a56ce: am 1889bb49: Reconcile with ics-mr0-release
* commit 'd49a56ce6405021b84ad4616f31d03f97732128c':
2011-11-22 15:29:52 -08:00
The Android Open Source Project
4273a3e0c3 am 1889bb49: Reconcile with ics-mr0-release
* commit '1889bb49a411cf79dd6ccd162bcddb13bd2567bb':
2011-11-22 15:26:16 -08:00
The Android Open Source Project
0922394b74 Reconcile with ics-mr0-release
Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864
2011-11-22 15:24:04 -08:00
The Android Open Source Project
afbeafd548 am 001bb6f8: am 27239099: Reconcile with ics-mr0-release
* commit '001bb6f8caf0bbdecfb1606a710c7c85b97151db':
2011-11-22 15:18:08 -08:00
The Android Open Source Project
82ac0ee5bc am 27239099: Reconcile with ics-mr0-release
* commit '2723909903b68db016666a13ec897581a8915636':
2011-11-22 15:16:08 -08:00
The Android Open Source Project
5d18060851 Reconcile with ics-mr0-release
Change-Id: I6367147c460a2e3eb2c13ac3fdb3946ab5fec9d0
2011-11-22 15:15:45 -08:00
The Android Open Source Project
46dbb9b634 Reconcile with ics-mr0-release
Change-Id: I0b5b295a6fc0e4e7978ce11905c3cffd0e07f7e1
2011-11-22 15:14:10 -08:00
The Android Automerger
5ac81863de merge in ics-mr0-release history after reset to ics-mr0 2011-11-22 14:28:06 -08:00
The Android Open Source Project
48ad95e81d Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I3200e581a74858b3b7728db974f10c2ed68004ad
2011-11-22 13:25:45 -08:00
dujin.cha
6754c614ca am 4d592c59: am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue
* commit '4d592c59e684ed3e6f0db4b05c37ba8774b8d410':
  [Prime K] Fix gabage character issue
2011-11-22 13:22:00 -08:00
dujin.cha
f47588cbb7 am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue
* commit 'eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
  [Prime K] Fix gabage character issue
2011-11-22 13:20:09 -08:00
Jean-Baptiste Queru
278fee1939 am 63899f78: (-s ours) am eff6ed0f: Ignore e36657e5
* commit '63899f78729a292e77cab0c9c01fff23b69a1b02':
  Do not merge. Fix a memory leak of a Binder in SpellCheckerService
2011-11-22 13:19:58 -08:00
dujin.cha
94b093c607 am fe464a76: [Prime K] Fix gabage character issue
* commit 'fe464a76d8fc858be971dbb5e67b1d22fd925347':
  [Prime K] Fix gabage character issue
2011-11-22 13:18:27 -08:00
Jean-Baptiste Queru
b420ff334a am eff6ed0f: Ignore e36657e5
* commit 'eff6ed0fee42e4324ceb8d5a20be09bb2f34aa9f':
  Do not merge. Fix a memory leak of a Binder in SpellCheckerService
2011-11-22 13:18:05 -08:00
Jean-Baptiste Queru
502a9c95c8 Ignore e36657e5
Change-Id: I93632b881f8c5231a521863cb4a8f05d81ea8ada
2011-11-22 13:15:31 -08:00
Jeff Brown
4265ed75f7 Merge "Use libcorkscrew to format the stack trace." 2011-11-22 12:57:08 -08:00
Romain Guy
f5cf93b9d8 am a2fabf4a: am 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1
* commit 'a2fabf4a109d46f99ff7370aa05e48c1708c2838':
  Draw in the correct FBO after invoking a GL functor Bug #5650514
2011-11-22 12:42:06 -08:00
Romain Guy
8920e57e06 am e25ed181: am 26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1
* commit 'e25ed181070579fca2522112b1659af2fbf8ddfc':
  Ensure we have an EGL context when building layers Bug #5638421
2011-11-22 12:42:04 -08:00
Amith Yamasani
f77abf649e am d61b61d6: am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
* commit 'd61b61d6f97f9f73b86e4a24a747c4451f2bc939':
  Fix an NPE on overflow in BatteryStats history.
2011-11-22 12:41:57 -08:00
Romain Guy
ad7e6ffdad am 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1
* commit '303a0695b8fa0b8f0095c437145a28633a7a8d92':
  Draw in the correct FBO after invoking a GL functor Bug #5650514
2011-11-22 12:35:25 -08:00
Romain Guy
4b557dd2ec am 26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1
* commit '26dd54f87c1daaa369576d9abea823c8105bd702':
  Ensure we have an EGL context when building layers Bug #5638421
2011-11-22 12:35:18 -08:00
Romain Guy
a67d4d23e5 Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1 2011-11-22 12:33:17 -08:00
Romain Guy
b1c3730a26 Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1 2011-11-22 12:33:04 -08:00
The Android Automerger
8d87636b10 merge in ics-mr1-release history after reset to ics-mr1 2011-11-22 11:56:20 -08:00
Fabrice Di Meglio
627149786f Merge "Improve TextLayoutCache performances" 2011-11-22 11:23:49 -08:00
Amith Yamasani
7ecd42facf am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
* commit '227a64fe23b4e6f05dc31e5f51b0f4c142e52b18':
  Fix an NPE on overflow in BatteryStats history.
2011-11-22 11:04:58 -08:00
Amith Yamasani
6ff0e8a106 Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1 2011-11-22 11:02:49 -08:00
Teng-Hui Zhu
8e276586f4 am b8ee50ee: am 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1
* commit 'b8ee50eece1481110721cb4e93a54c03fbf77d27':
  HTML5 Video runs into super full screen mode
2011-11-22 08:59:36 -08:00
Teng-Hui Zhu
9174795018 am 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1
* commit '7257a32b9ac7cbbb47659ed7bea4ab47e74ac3ec':
  HTML5 Video runs into super full screen mode
2011-11-22 08:57:02 -08:00
Teng-Hui Zhu
05e688ad9d Merge "HTML5 Video runs into super full screen mode" into ics-mr1 2011-11-22 08:54:59 -08:00
Andreas Huber
e84bc95d84 am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit '31626b3075335f4cf579342e99436bb45870cf55':
  Report a runtime error instead of asserting on malformed avc configuration data.
2011-11-22 08:43:28 -08:00
Andreas Huber
54bccc2cfc am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit 'cb6fbc89c25298643ab342b4a228e772b0e56978':
  Report a runtime error instead of asserting on malformed avc configuration data.
2011-11-22 08:41:04 -08:00
Andreas Huber
2389af0dc6 Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 2011-11-22 08:39:11 -08:00
Daniel Sandler
aed6564bb0 am 70f1279e: am 63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1
* commit '70f1279e65eaa138f297a8f590f8383f2c76f7b4':
  Dismiss system windows when screen savers start.
2011-11-22 07:19:02 -08:00
Daniel Sandler
fde159f6fb am 63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1
* commit '631885746868cbf03f89e655a6f4fac96449e8a4':
  Dismiss system windows when screen savers start.
2011-11-22 07:16:47 -08:00
Daniel Sandler
9f96a44b20 Merge "Dismiss system windows when screen savers start." into ics-mr1 2011-11-22 07:15:29 -08:00
Mangesh Ghiware
b6ca25e0a2 am d7b06977: am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
* commit 'd7b06977e927557923a6101493c0af1aa857271b':
  Update zoom (aka display) density from WebView thread.
2011-11-21 23:18:04 -08:00
Mangesh Ghiware
47aa84dc62 am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
* commit '8d03007f80d74abadfc96926e7cca40d38380bc0':
  Update zoom (aka display) density from WebView thread.
2011-11-21 23:16:06 -08:00
Mangesh Ghiware
2b7f7eb1fa Merge "Update zoom (aka display) density from WebView thread." into ics-mr1 2011-11-21 23:14:05 -08:00
Romain Guy
f512476e25 am ea54d0dc: am 723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1
* commit 'ea54d0dc0dfeef5560fea04667804413d522025f':
  Hide ManagedEGLContext until we are sure this is the correct API.
2011-11-21 21:23:49 -08:00
Romain Guy
96e41aaca4 am 723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1
* commit '723218b4f428944bdb11b25d0b30ece56283f696':
  Hide ManagedEGLContext until we are sure this is the correct API.
2011-11-21 21:20:57 -08:00
Romain Guy
14986f7cb5 Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1 2011-11-21 21:18:51 -08:00
James Dong
478e08ad5c am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
* commit 'd0a254566f5f0be5607b4d64839a575c888c94f6':
  Fix log spamming during time lapse video recording
2011-11-21 21:08:55 -08:00
Romain Guy
c61ceea790 am ae64dfb5: am 1766b0e2: Fix the build
* commit 'ae64dfb5c34eed73bdc7ada30645ffec003c25fc':
  Fix the build
2011-11-21 21:08:52 -08:00
Wu-cheng Li
8f85bb850a am a21d5d2c: am e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
* commit 'a21d5d2c53a37e4f20716cbb5e5d1944b8a3f7df':
  Move Camera.Sound to a stand-alone class CameraSound.
2011-11-21 21:08:50 -08:00
Mathias Agopian
6b7c5da722 am cc4d02e0: am 07a2d831: Merge "don\'t report an error when disconnecting from an abandoned surfacetexture" into ics-mr1
* commit 'cc4d02e0cbb99341a0508838c88eeef53180fdfd':
  don't report an error when disconnecting from an abandoned surfacetexture
2011-11-21 21:08:47 -08:00
Mathias Agopian
93a098fb6e am 8390cf39: am 8646cd42: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
* commit '8390cf39f8a4f74f7baa91d23cba06894a3fb9b5':
  enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
2011-11-21 21:08:44 -08:00
Romain Guy
ddbaa9d7e6 am c26e4d18: am 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1
* commit 'c26e4d18a20ab0b3e769fb3e547994f1c27d6713':
  Notify views when EGL resources are about to be destroyed Bug #5639899
2011-11-21 21:08:42 -08:00
Adam Powell
9d5f7e1c9e am 516035f0: am fb0784da: Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1
* commit '516035f0923aad612932327546e780c7c241ceda':
  Fix bug 5521467 - Monkeys and ActionBar custom tab views
2011-11-21 21:08:40 -08:00