]> git.saurik.com Git - android/aapt.git/commitdiff
am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.
authorDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 14:45:38 +0000 (07:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Jun 2011 14:45:38 +0000 (07:45 -0700)
* commit 'c6adfed6dcea8482e482db58bd396ea8de08426a':
  Okay *now* really enforce the limit on non-public styles.

1  2 
ResourceTable.cpp

Simple merge