OSDN Git Service

am 6d38bdfc: resolved conflicts for merge of a74a4811 to honeycomb-plus-aosp
authorYing Wang <wangying@google.com>
Thu, 11 Aug 2011 23:59:48 +0000 (16:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Aug 2011 23:59:48 +0000 (16:59 -0700)
* commit '6d38bdfc7b9ff699370b4a40dcbdddce0ea713b8':
  sha module is deprecated


Trivial merge