OSDN Git Service

am faf09726: (-s ours) DO NOT MERGE
authorMike J. Chen <mjchen@google.com>
Thu, 17 May 2012 19:40:28 +0000 (12:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 May 2012 19:40:28 +0000 (12:40 -0700)
commitccb70f869c4a88545084f00b441dfba9a6bc9919
tree9932d02af365b0e3f3608e14872f01ed2bd0de71
parent9e2f0d10a7ede331c8554c267c728908a96ab6c0
parentfaf09726440968df89ebe6ebfdb373b8e42d711a
am faf09726: (-s ours) DO NOT MERGE

* commit 'faf09726440968df89ebe6ebfdb373b8e42d711a':
  DO NOT MERGE