Commit Graph

  • 0cd2f4c878 Merge change 261 Android (Google) Code Review 2009-04-20 10:04:34 -0700
  • d7d33c36b0 Merge branch 'readonly-p4-master' Dmitry Shmidt 2009-04-20 09:54:14 -0700
  • 2ad33d01a9 Merge branch 'readonly-p4-donut' into donut Dmitry Shmidt 2009-04-20 09:50:17 -0700
  • 9a110fee1c Merge branch 'readonly-p4-master' Evan Millar 2009-04-18 23:36:20 -0700
  • 8eadf141f6 Merge branch 'readonly-p4-master' Dave Sparks 2009-04-18 23:02:23 -0700
  • c732d9df1d Merge branch 'readonly-p4-master' Jean-Michel Trivi 2009-04-18 22:59:37 -0700
  • ea5ee32872 Merge branch 'readonly-p4-master' Urs Grob 2009-04-18 22:48:29 -0700
  • dc46d966d6 Merge branch 'readonly-p4-master' Dave Sparks 2009-04-18 22:26:57 -0700
  • 51925b69e3 Merge branch 'readonly-p4-master' Dave Sparks 2009-04-18 22:21:29 -0700
  • 7b59cf703a Merge branch 'readonly-p4-master' Brandon Ballinger 2009-04-18 22:05:19 -0700
  • 1d11e2671c Merge branch 'readonly-p4-master' Dirk Dougherty 2009-04-18 22:02:32 -0700
  • 67f56a11af Merge branch 'readonly-p4-master' Dirk Dougherty 2009-04-18 21:59:48 -0700
  • aea732c8d6 Merge branch 'readonly-p4-master' Xavier Ducrohet 2009-04-18 21:43:30 -0700
  • ec199f6634 Merge branch 'readonly-p4-master' Dirk Dougherty 2009-04-18 21:11:00 -0700
  • cbf8225789 Merge branch 'readonly-p4-master' Dirk Dougherty 2009-04-18 21:08:19 -0700
  • ac08d9c38b Merge branch 'readonly-p4-master' Scott Main 2009-04-18 16:14:56 -0700
  • 4bb4aab510 Merge branch 'readonly-p4-master' Scott Main 2009-04-18 16:12:09 -0700
  • d0604d37af Merge branch 'readonly-p4-master' Guang Zhu 2009-04-18 15:58:39 -0700
  • 53d361410d Merge branch 'readonly-p4-master' Ramanan Rajeswaran 2009-04-18 15:29:04 -0700
  • 287657b079 Merge branch 'readonly-p4-donut' into donut Evan Millar 2009-04-18 12:27:51 -0700
  • 3e8a53e769 Merge change 287 into donut Android (Google) Code Review 2009-04-17 16:24:12 -0700
  • 9b187e977a Merge change 279 into donut Android (Google) Code Review 2009-04-17 14:20:38 -0700
  • 4573f5982d Merge change 263 into donut Android (Google) Code Review 2009-04-17 14:05:57 -0700
  • 34dd2d1c2d Merge commit 'goog/master' into merge_master Mathias Agopian 2009-04-17 13:11:48 -0700
  • b083de35b8 Merge branch 'readonly-p4-donut' into donut Dave Sparks 2009-04-17 11:49:44 -0700
  • 823b984ed9 Merge branch 'readonly-p4-donut' into donut Jean-Michel Trivi 2009-04-17 11:46:50 -0700
  • 14bbab5616 Merge branch 'readonly-p4-donut' into donut Urs Grob 2009-04-17 11:31:36 -0700
  • c5a8dd2f82 Merge change 271 Android (Google) Code Review 2009-04-17 11:04:03 -0700
  • 412f38f270 Manually merge 129, 174, and 233 from donut Jack Palevich 2009-04-13 16:22:25 -0700
  • f8c4464414 Merge change 164 Android (Google) Code Review 2009-04-17 05:26:25 -0700
  • 18d8446fe1 cleanup, remove unused fields. Also make sure that we don't systematically allocate a Surface in Surface.java if only a SurfaceControl is needed (Common case). Mathias Agopian 2009-04-16 20:30:22 -0700
  • 01b766839e more splitting of Surface/SurfaceControl. Surface.java is now implemented in terms of Surface and SurfaceControl. Mathias Agopian 2009-04-16 20:04:08 -0700
  • 0eb6d6e33d Merge branch 'readonly-p4-donut' into donut Dave Sparks 2009-04-16 19:55:31 -0700
  • cb19163660 Merge change 233 into donut Android (Google) Code Review 2009-04-16 17:55:44 -0700
  • 658c6a1347 Merge branch 'readonly-p4-donut' into donut Dave Sparks 2009-04-16 17:51:48 -0700
  • 62185b7335 split Surface.cpp into Surface and SurfaceControl Mathias Agopian 2009-04-16 16:19:50 -0700
  • 427f585f72 Add an Android-specific static OpenGL ES 1.1 Java API. Jack Palevich 2009-04-15 19:13:17 -0700
  • db3095c118 Merge branch 'readonly-p4-donut' into donut Brandon Ballinger 2009-04-16 14:33:04 -0700
  • 1ce38018f9 Merge branch 'readonly-p4-donut' into donut Dirk Dougherty 2009-04-16 14:29:31 -0700
  • 73bca2e954 Merge branch 'readonly-p4-donut' into donut Dirk Dougherty 2009-04-16 13:35:30 -0700
  • 519b9c52c1 Merge branch 'readonly-p4-master' Ramanan Rajeswaran 2009-04-16 12:48:12 -0700
  • 9a4ec0a034 Merge branch 'readonly-p4-donut' into donut Xavier Ducrohet 2009-04-16 12:45:54 -0700
  • 3628d1d00d Merge branch 'readonly-p4-master' Ramanan Rajeswaran 2009-04-16 12:42:17 -0700
  • 62b74444be fix a few typos in comments. this is really intended as a git pull/push test. Mathias Agopian 2009-04-14 23:02:51 -0700
  • 40b7f6e043 fix some issues with Surface's lifetime management. Mathias Agopian 2009-04-14 18:21:47 -0700
  • 19caa910f3 Merge branch 'readonly-p4-master' Scott Main 2009-04-16 11:43:01 -0700
  • afac476f5b Merge changes 222,223,227 Android (Google) Code Review 2009-04-16 11:12:33 -0700
  • 4f33a4c871 Merge change 219 Android (Google) Code Review 2009-04-16 11:11:14 -0700
  • fd25425797 Merge branch 'readonly-p4-master' Robert Greenwalt 2009-04-16 11:07:25 -0700
  • 225b75ca30 Merge branch 'readonly-p4-master' Ramanan Rajeswaran 2009-04-16 10:49:44 -0700
  • 5c6e70f655 Merge change 195 Android (Google) Code Review 2009-04-16 06:21:10 -0700
  • 753b1c74e9 Merge change 187 into donut Android (Google) Code Review 2009-04-16 00:05:57 -0700
  • 4243e66621 fix a rookie mistake causing Singleton<> to be a "multiton". Also improve the BufferMapper's debugging, but turn it off. Mathias Agopian 2009-04-15 18:34:24 -0700
  • f6a56f6813 Merge change 186 into donut Android (Google) Code Review 2009-04-15 12:13:07 -0700
  • 9a081ce2ca Merge branch 'readonly-p4-donut' into donut Dirk Dougherty 2009-04-15 11:35:03 -0700
  • 72362b79bc Merge branch 'readonly-p4-donut' into donut Dirk Dougherty 2009-04-15 11:32:07 -0700
  • f6aed0365c Merge change 190 into donut Android (Google) Code Review 2009-04-15 08:21:40 -0700
  • af43695f97 Merge branch 'readonly-p4-master' Eric Shienbrood 2009-04-15 06:59:53 -0700
  • f32a863262 Merge change 174 into donut Android (Google) Code Review 2009-04-15 06:14:11 -0700
  • 65943af798 Merge change 175 into donut Android (Google) Code Review 2009-04-14 20:19:42 -0700
  • ffac1eff58 Improve glgen Jack Palevich 2009-04-14 19:00:09 -0700
  • 106f3a4aed Merge commit 'korg/cupcake' The Android Open Source Project 2009-04-14 18:18:15 -0700
  • 23525ac2a3 Merge commit 'korg/cupcake' The Android Open Source Project 2009-04-14 18:18:03 -0700
  • 5eb4852639 Merge branch 'readonly-p4-donut' into donut Scott Main 2009-04-14 17:23:06 -0700
  • 151414fed9 Merge branch 'readonly-p4-donut' into donut Scott Main 2009-04-14 17:02:10 -0700
  • 1c7ce8787d Merge branch 'readonly-p4-donut' into donut Guang Zhu 2009-04-14 16:47:03 -0700
  • 240a001160 Merge branch 'readonly-p4-master' Eric Shienbrood 2009-04-14 15:41:38 -0700
  • 4cf74ac30a Merge commit 'goog/master' into merge_master Mathias Agopian 2009-04-14 15:21:33 -0700
  • 0a2b2b905f Merge commit 'goog/master_gl' into merge_master Mathias Agopian 2009-04-14 14:56:34 -0700
  • 83d184a299 Merge commit 'goog/master' into merge_master Mathias Agopian 2009-04-14 14:20:43 -0700
  • 6f6fcc2afa Merge changes 108,130,131 into donut Android (Google) Code Review 2009-04-14 14:40:02 -0700
  • 3cc9a57fe9 Merge change 109 into donut Android (Google) Code Review 2009-04-14 14:39:51 -0700
  • 7b624ffa05 Merge branch 'readonly-p4-master' Yu Shan Emily Lau 2009-04-14 14:33:23 -0700
  • 4dc58eb1b7 Merge change 129 into donut Android (Google) Code Review 2009-04-14 14:15:22 -0700
  • aa913f65ce Merge change 154 into donut Android (Google) Code Review 2009-04-14 13:36:33 -0700
  • 609901a028 Merge change 133 into donut Android (Google) Code Review 2009-04-14 13:20:43 -0700
  • 8c7acbe3e4 Merge change 132 into donut Android (Google) Code Review 2009-04-14 13:15:43 -0700
  • 3fcff1d7a4 Merge change 142 into donut Android (Google) Code Review 2009-04-14 12:52:28 -0700
  • a2aef005fc Merge branch 'readonly-p4-master' Dan Bornstein 2009-04-14 12:42:22 -0700
  • 7d6daac1a1 Merge branch 'readonly-p4-master' Brett Chabot 2009-04-14 12:39:37 -0700
  • 4680ab625f Merge branch 'readonly-p4-master' Lorenzo Colitti 2009-04-14 12:10:26 -0700
  • 56eccb2855 Merge commit 'goog/master' Leon Scroggins 2009-04-14 12:06:19 -0700
  • 11b61b471f Merge change 79 Android (Google) Code Review 2009-04-14 11:54:14 -0700
  • b52d5323ea Merge branch 'readonly-p4-master' Leon Scroggins 2009-04-14 11:07:14 -0700
  • 34dd8b0422 Merge branch 'readonly-p4-donut' into donut Ramanan Rajeswaran 2009-04-14 11:07:13 -0700
  • f903a0e151 Merge branch 'readonly-p4-donut' into donut Ramanan Rajeswaran 2009-04-14 09:48:58 -0700
  • e86ac7cf26 Merge branch 'readonly-p4-donut' into donut Ramanan Rajeswaran 2009-04-14 09:34:58 -0700
  • 8f75e091d9 Add clarifying comment. Jack Palevich 2009-04-13 22:03:39 -0700
  • 519e83f566 Merge change 105 into donut Android (Google) Code Review 2009-04-13 21:37:13 -0700
  • 08a305b8f7 Merge commit 'goog/master' into HEAD Jack Palevich 2009-04-13 19:52:45 -0700
  • 06fd85fe11 Merge branch 'readonly-p4-donut' into donut Scott Main 2009-04-13 18:47:22 -0700
  • 7f0548c8ee Merge branch 'readonly-p4-donut' into donut Robert Greenwalt 2009-04-13 18:36:18 -0700
  • 5eabe8272f Merge branch 'readonly-p4-donut' into donut Ramanan Rajeswaran 2009-04-13 18:16:57 -0700
  • 84c73eef74 Merge branch 'readonly-p4-donut' into donut Eric Shienbrood 2009-04-13 18:14:07 -0700
  • beef201149 Merge branch 'readonly-p4-donut' into donut Yu Shan Emily Lau 2009-04-13 17:48:53 -0700
  • 6414b70404 Merge branch 'readonly-p4-donut' into donut Dan Bornstein 2009-04-13 17:46:03 -0700
  • cdda14a60c Merge branch 'readonly-p4-master' Jeffrey Sharkey 2009-04-13 16:58:42 -0700
  • 7a8e25ab11 Merge branch 'readonly-p4-master' Dianne Hackborn 2009-04-13 16:55:10 -0700
  • c11ebc3cd3 Merge branch 'readonly-p4-master' Dirk Dougherty 2009-04-13 16:52:33 -0700
  • 6cbca50b6a Clean up trivial Eclipse warnings and fix whitespace. Jack Palevich 2009-04-13 16:22:25 -0700