OSDN Git Service

am 941733e7: am 960177ae: (-s ours) am ca250167: (-s ours) Merge "DO NOT MERGE. ...
authorDianne Hackborn <hackbod@google.com>
Sat, 5 Nov 2011 19:36:09 +0000 (19:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 5 Nov 2011 19:36:09 +0000 (19:36 +0000)
commit2366bfd87ca98e5e6577ed68e60a89670f39e391
tree2efb6b50507926604135f863eb20c6d8090b5a54
parentd3815d3fe1d87dbbee9627abe65859c1dbf94044
parent3f95c7588b975c41dc23239cafeaad1f31b790b7
am 941733e7: am 960177ae: (-s ours) am ca250167: (-s ours) Merge "DO NOT MERGE.  Integrate: Include showmap output in bug report." into ics-mr0

* commit '941733e7d19915b08474d972718e2375782e4598':
  DO NOT MERGE.  Integrate: Include showmap output in bug report.