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:50:37 +0000 (11:50 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Nov 2011 19:50:37 +0000 (11:50 -0800)
commit2b5a61f40a1b7c4dd84d7c552c81ee4829358a82
tree6cbf98dae66211e2d9e10c69502de4be3fe0012d
parent38f5f175d9e7e07ebb986090c61368abea4568f0
parent7ac9a9afafbc7c515a73086c11a15a27c7fd05b1
am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1

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