]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d10e5a1 b325884)
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)
* commit '2e4a3236a7634d17f89288e9739a438ecbea0471':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.


Trivial merge
mirror of aapt