]> git.saurik.com Git - android/aapt.git/commitdiff
am 9fc20b0e: Merge change 8126 into donut
authorAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 22 Jul 2009 02:03:53 +0000 (19:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Jul 2009 02:03:53 +0000 (19:03 -0700)
Merge commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf'

* commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf':
  First pass at reworking screen density/size APIs.

1  2 
AaptAssets.h

diff --cc AaptAssets.h
Simple merge