]> git.saurik.com Git - android/aapt.git/commitdiff
am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents...
authorDianne Hackborn <hackbod@google.com>
Thu, 9 Jun 2011 23:06:07 +0000 (16:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jun 2011 23:06:07 +0000 (16:06 -0700)
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
  Enforce public resource restriction on bag parents.

1  2 
ResourceTable.cpp

Simple merge