am 2e4a3236: (-s ours) am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE.  Integrate add new screen width/height in "dp" configs." into honeycomb-mr2

* commit '2e4a3236a7634d17f89288e9739a438ecbea0471':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.
tree: 7c3a0d82b39adcb5d87692084cd4df7dc4a73876
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE