OSDN Git Service

am 5bd82f69: When reparenting, prefer GROUP_ROW_ID but allow fallback.
authorJeff Sharkey <jsharkey@android.com>
Fri, 30 Oct 2009 02:34:32 +0000 (19:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Oct 2009 02:34:32 +0000 (19:34 -0700)
Merge commit '5bd82f693788c39c2b2225ac49b38cb8be5d1d18' into eclair-mr2

* commit '5bd82f693788c39c2b2225ac49b38cb8be5d1d18':
  When reparenting, prefer GROUP_ROW_ID but allow fallback.


Trivial merge