OSDN Git Service

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


Trivial merge