OSDN Git Service

am 88d00c24: Hook up logic for re-parenting of user edits, unit tests.
authorJeff Sharkey <jsharkey@android.com>
Wed, 23 Sep 2009 12:48:24 +0000 (05:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Sep 2009 12:48:24 +0000 (05:48 -0700)
Merge commit '88d00c2450a0a16bf1dd35e9f3c9ba843a97ec62' into eclair-plus-aosp

* commit '88d00c2450a0a16bf1dd35e9f3c9ba843a97ec62':
  Hook up logic for re-parenting of user edits, unit tests.


Trivial merge