| commit | 72d695db13aec15b011c8f5fb9339d498ca47512 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Nov 04 21:03:53 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 04 21:03:53 2011 +0000 |
| tree | c31ead79e1c8caa0dfecd24ad0eb73f1191e292f | |
| parent | e371f586e0161f14513745bc4263370309fb7353 [diff] | |
| parent | 230b99fb850bbbe17b8ee41d1968062d72895fdd [diff] |
am 230b99fb: am 2c9d3f92: (-s ours) DO NOT MERGE. Integrate: showmap now includes the number of maps in a row. * commit '230b99fb850bbbe17b8ee41d1968062d72895fdd': DO NOT MERGE. Integrate: showmap now includes the number of maps in a row.