OSDN Git Service

am 2c9d3f92: (-s ours) DO NOT MERGE. Integrate: showmap now includes the number...
authorDianne Hackborn <hackbod@google.com>
Fri, 4 Nov 2011 21:01:39 +0000 (21:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Nov 2011 21:01:39 +0000 (21:01 +0000)
commit230b99fb850bbbe17b8ee41d1968062d72895fdd
treeafefefc2ee34b254d975d70665428255ad5d5265
parent42ec73551a7ed4798de53cb8ed3b34fa964dde98
parent2c9d3f9293fc4c511e8f031cdade3f0cb9d93127
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.