summaryrefslogtreecommitdiffstats
path: root/tools/aapt/Resource.cpp
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2014-09-09 05:30:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-09 05:30:47 +0000
commit95babac7f58b552633ca511ece0b47adaf8a19c3 (patch)
tree02053e700aad6fba9d609414d9c3ca4abbfaa6f4 /tools/aapt/Resource.cpp
parentd94728a78cd47084912c0941a0fd86d3276c7956 (diff)
parent3256adc666b183253972a472d3a6cd45e7fb989e (diff)
downloadframeworks_base-95babac7f58b552633ca511ece0b47adaf8a19c3.zip
frameworks_base-95babac7f58b552633ca511ece0b47adaf8a19c3.tar.gz
frameworks_base-95babac7f58b552633ca511ece0b47adaf8a19c3.tar.bz2
am 77baaa4a: am 437bd674: am f71585f6: Merge "Use new device identifier to check if a layout has been set." into lmp-dev
* commit '77baaa4a16e320497195a9832d7d8f77add6b82c': Use new device identifier to check if a layout has been set.
Diffstat (limited to 'tools/aapt/Resource.cpp')
0 files changed, 0 insertions, 0 deletions