tree 7407fb8697fcee5135145bd3c6d00c249c02b9a1
parent 52aa0636c6caef0bd2601fb1f4ec06a34d9ac7a2
parent 166ebd4da5d85195bd1f562572f468726ade548f
author Adam Cohen <adamcohen@google.com> 1385508012 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385508012 -0800

am 166ebd4d: De-parent custom content view before adding to custom content screen

* commit '166ebd4da5d85195bd1f562572f468726ade548f':
  De-parent custom content view before adding to custom content screen