tree 10da860fcff71886af91d082e31f0e1917926848
parent 65a0442010e2ebae99914550477b57acb5822e18
parent be20490b25011fe730824412ab674c447d26ffbe
author Adam Cohen <adamcohen@google.com> 1414566377 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566377 +0000

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

* commit 'be20490b25011fe730824412ab674c447d26ffbe':