Merge "bug:4121206 handle STOPSHIP comments/code" into honeycomb-mr1
authorVasu Nori <vnori@google.com>
Thu, 17 Mar 2011 22:37:04 +0000 (15:37 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Mar 2011 22:37:04 +0000 (15:37 -0700)
commit7666801aeaf7c69144ab39761156010ddbb809f7
treee5166e08681b99a3337b08fe8476768a9e53f1a1
parent5d8371922b8851ae9596a565b9dc2f7922026362
parentcc048de9b7b2433ef497e4495126a166409ad3f7
Merge "bug:4121206 handle STOPSHIP comments/code" into honeycomb-mr1