]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 293ee86 4ee37df)
am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height...
authorDianne Hackborn <hackbod@google.com>
Fri, 13 May 2011 18:21:26 +0000 (11:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 May 2011 18:21:26 +0000 (11:21 -0700)
* commit '46a282f323bc05606e4fe1eba795bd9ac7c99819':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.

1  2 
ResourceTable.cpp patch | diff1 | diff2 | blob | history

diff --cc ResourceTable.cpp
Simple merge
mirror of aapt