OSDN Git Service

am 3975280e: (-s ours) am 76afc004: Integrate sdk.atree changes from master. DO NOT...
authorXavier Ducrohet <xav@android.com>
Thu, 30 Sep 2010 23:00:51 +0000 (16:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Sep 2010 23:00:51 +0000 (16:00 -0700)
Merge commit '3975280e0583d45de4708375622b22019a0df9f5'

* commit '3975280e0583d45de4708375622b22019a0df9f5':
  Integrate sdk.atree changes from master. DO NOT MERGE


Trivial merge