summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-05-19 17:17:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-19 17:17:30 -0700
commit90177e59e5211dd9ab33761ce800e8a86a49d1e2 (patch)
tree76a0b398c19fcb397dbdf4651add1b96519ca506 /tools
parent5b9ceebafd36db4491a49c1f00750ce50c4d4433 (diff)
parentd40575eb983eb7a1d383acc1f30f467374acd085 (diff)
downloadframeworks_base-90177e59e5211dd9ab33761ce800e8a86a49d1e2.zip
frameworks_base-90177e59e5211dd9ab33761ce800e8a86a49d1e2.tar.gz
frameworks_base-90177e59e5211dd9ab33761ce800e8a86a49d1e2.tar.bz2
am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
* commit 'd40575eb983eb7a1d383acc1f30f467374acd085': DO NOT MERGE Action bar config changes
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions