tree cba62d0d64153aa2169651696bc238591341d679
parent d11abc71e9be940db2169eac581e85d913a6c598
parent 0008ff9b365460757776fd048e0e45690f5548af
author Adam Cohen <adamcohen@google.com> 1414085505 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085505 +0000

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

* commit '0008ff9b365460757776fd048e0e45690f5548af':