| commit | 230b99fb850bbbe17b8ee41d1968062d72895fdd | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Nov 04 21:01:39 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 04 21:01:39 2011 +0000 |
| tree | afefefc2ee34b254d975d70665428255ad5d5265 | |
| parent | 42ec73551a7ed4798de53cb8ed3b34fa964dde98 [diff] | |
| parent | 2c9d3f9293fc4c511e8f031cdade3f0cb9d93127 [diff] |
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.