OSDN Git Service

am 70c822e7: am 678c7ac9: (-s ours) am d7798a7e: fix TINY ANDROID yet again...
authorBrian Swetland <swetland@google.com>
Thu, 3 Feb 2011 00:25:01 +0000 (16:25 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Feb 2011 00:25:01 +0000 (16:25 -0800)
* commit '70c822e7106ac97a1a2b4e5d404e54efc34ad344':
  fix TINY ANDROID yet again...


Trivial merge