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)
commit8a0654231ff36d938bc3451190cf67231195f1d0
tree8453db6b4612fb518e95bfe2510198ee2b3eab23
parent2c41bce3f2134159ce64d589ff1bb298b9939178
parent23217182743521063655c6fb1b1580d3558cfbe7
am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1

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