tree 8e34792d0005a2ce28e9ebb2e2cd5f7fb1b3faf5
parent 53b995f00c84d6ed9f10d4e8ddd0f38a33072af9
parent d735122857231d3e6e74e516f2de5fa101b14d7e
author Adam Cohen <adamcohen@google.com> 1392411247 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411247 +0000

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

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