summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-02-23 18:49:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-23 18:49:51 -0800
commit6caa03004df8bfc7f4718c2afecf56b0b59fa764 (patch)
tree958071c79627ca1be8e55fe2f45945de608717e6
parenta12522b73dac6baf622004f77ad97ac47059c21f (diff)
parent1704a5cc59c501fab53dbd2e754a8479ac1f57ca (diff)
downloadframeworks_base-6caa03004df8bfc7f4718c2afecf56b0b59fa764.zip
frameworks_base-6caa03004df8bfc7f4718c2afecf56b0b59fa764.tar.gz
frameworks_base-6caa03004df8bfc7f4718c2afecf56b0b59fa764.tar.bz2
am 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '1704a5cc59c501fab53dbd2e754a8479ac1f57ca':
0 files changed, 0 insertions, 0 deletions