]> git.saurik.com Git - android/aapt.git/commitdiff
am 6efe03b1: am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into...
authorYing Wang <wangying@google.com>
Wed, 27 Jan 2010 23:53:20 +0000 (15:53 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 Jan 2010 23:53:20 +0000 (15:53 -0800)
Merge commit '6efe03b19e0734361b262f9a0be4d225088d7f9e'

* commit '6efe03b19e0734361b262f9a0be4d225088d7f9e':
  Find layout classes in all "layout-*" dirs.

1  2 
Resource.cpp

diff --cc Resource.cpp
Simple merge