Go to file
Bill Gruber 1f3bce972e am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0
* commit '92ad16d342aa4d39bad33600161b3799b84716f3':
  Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766
2011-12-01 11:54:57 -08:00
cmds Remove the simulator target from all makefiles. 2011-07-11 22:12:16 -07:00
include Merge changes I7e973a35,Ib3386fcc into ics-mr1 2011-11-29 17:46:35 -08:00
libs SurfaceTexture: add EGL_KHR_fence_sync option 2011-11-29 17:09:01 -08:00
opengl add a way to access the version string of the h/w implementation of EGL 2011-11-29 18:00:35 -08:00
services/surfaceflinger Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1 2011-11-30 13:52:21 -08:00
MODULE_LICENSE_APACHE2 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00