]> git.saurik.com Git - android/aapt.git/commit
am 2e4a3236: (-s ours) am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate...
authorDianne Hackborn <hackbod@google.com>
Fri, 13 May 2011 22:22:30 +0000 (15:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 May 2011 22:22:30 +0000 (15:22 -0700)
commitc16f66a712f69e002a4a9de27a9c82352d9092c3
treed08e29fcff1d6662af9267230993d45120b9049e
parentd10e5a1efbe4c21a2b09884abb44e94830d3d0b3
parentb3258848c357fc9b8d9d478ab36eead82947fb61
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.