am 7666801a: Merge "bug:4121206 handle STOPSHIP comments/code" into honeycomb-mr1
authorVasu Nori <vnori@google.com>
Thu, 17 Mar 2011 22:38:48 +0000 (15:38 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Mar 2011 22:38:48 +0000 (15:38 -0700)
commit32d9917cd4f56cabcbafa645c8cd89cd832ac523
treee5166e08681b99a3337b08fe8476768a9e53f1a1
parent3ac912e7e062132b202f0231fb84edfa8790844e
parent7666801aeaf7c69144ab39761156010ddbb809f7
am 7666801a: Merge "bug:4121206 handle STOPSHIP comments/code" into honeycomb-mr1

* commit '7666801aeaf7c69144ab39761156010ddbb809f7':
  bug:4121206 handle STOPSHIP comments/code