OSDN Git Service

am d514fe7e: (-s ours) DO NOT MERGE
authorMike J. Chen <mjchen@google.com>
Wed, 16 May 2012 18:04:08 +0000 (11:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 May 2012 18:04:08 +0000 (11:04 -0700)
commitb34273dcf5161caed17ed501e30b1310cfb1991a
treefc04579c6ca0101388c8908acbb7e44eec8f30ad
parent50d82584f581fa334da457027812463ac99299d3
parentd514fe7ec53e7c8f63dd2f8776e905d37acdbc9a
am d514fe7e: (-s ours) DO NOT MERGE

* commit 'd514fe7ec53e7c8f63dd2f8776e905d37acdbc9a':
  DO NOT MERGE