tree ba7d70ae693f05b9748d38ec5266a43c12b208cc
parent c82aa4cd1ea81c5fae7901bcb147df0ca082594b
parent 0a23daaca14ab7fd107ee3e4043b5793760e02c1
author Adam Cohen <adamcohen@google.com> 1392410296 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410296 +0000

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

* commit '0a23daaca14ab7fd107ee3e4043b5793760e02c1':
  De-parent custom content view before adding to custom content screen