OSDN Git Service

am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
authorAndreas Huber <andih@google.com>
Fri, 11 Nov 2011 19:48:16 +0000 (11:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Nov 2011 19:48:16 +0000 (11:48 -0800)
commit18f9bb10922123940d1929724fcb7a45cc757c93
tree5550d546b9610985bfd447b04562fdceef310c1e
parent1e809edd9b25e34d9c475ecd2c2e26ddc75cba2c
parent7ac9a9afafbc7c515a73086c11a15a27c7fd05b1
am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1

* commit '23217182743521063655c6fb1b1580d3558cfbe7':
  Didn't mean to check this in...