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)
* commit 'faf09726440968df89ebe6ebfdb373b8e42d711a':
  DO NOT MERGE


Trivial merge