]> git.saurik.com Git - android/aapt.git/commitdiff
am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.
authorDianne Hackborn <hackbod@google.com>
Fri, 20 May 2011 02:34:21 +0000 (19:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 May 2011 02:34:21 +0000 (19:34 -0700)
* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
  Add new "-swNNNdp" resource qualifier.

1  2 
ResourceTable.cpp

Simple merge