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)
* commit '23217182743521063655c6fb1b1580d3558cfbe7':
  Didn't mean to check this in...


Trivial merge