summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-11-04 21:01:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-04 21:01:39 +0000
commit230b99fb850bbbe17b8ee41d1968062d72895fdd (patch)
treeafefefc2ee34b254d975d70665428255ad5d5265
parent42ec73551a7ed4798de53cb8ed3b34fa964dde98 (diff)
parent2c9d3f9293fc4c511e8f031cdade3f0cb9d93127 (diff)
downloadextras-230b99fb850bbbe17b8ee41d1968062d72895fdd.tar.gz
am 2c9d3f92: (-s ours) DO NOT MERGE. Integrate: showmap now includes the number of maps in a row.
* commit '2c9d3f9293fc4c511e8f031cdade3f0cb9d93127': DO NOT MERGE. Integrate: showmap now includes the number of maps in a row.
0 files changed, 0 insertions, 0 deletions