Go to file
Scott Main dded7b681f am deb92c61: am fc28fbd4: am 26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit 'deb92c612bc4b91be8f85da06c618c64b1cd20a8':
  docs: Google+ badge now sizes properly; remove reposition hack
2012-02-15 14:24:07 -08:00
cmds Merge "Fix build warnings" 2012-02-13 16:43:43 -08:00
include Merge "Clean up InputChannel file descriptor data type." 2012-02-14 17:11:41 -08:00
libs Merge "Refactored query function from SurfaceTexture into BufferQueue" 2012-02-14 16:29:02 -08:00
opengl Merge "Don't wrap EGLImageKHR and EGLSyncKHR anymore" 2012-02-14 18:59:47 -08:00
services/surfaceflinger Merge "Return information about whether overlays are disabled." 2012-02-07 13:46:46 -08:00
MODULE_LICENSE_APACHE2
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00