tree 8e34792d0005a2ce28e9ebb2e2cd5f7fb1b3faf5
parent e7a4283415c52d17988dcc80a35731044b88ab34
parent 0008ff9b365460757776fd048e0e45690f5548af
author Adam Cohen <adamcohen@google.com> 1392411721 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411721 +0000

am 0008ff9b: am d7351228: am 0a23daac: am 166ebd4d: De-parent custom content view before adding to custom content screen

* commit '0008ff9b365460757776fd048e0e45690f5548af':
  De-parent custom content view before adding to custom content screen