OSDN Git Service

am 0008ff9b: am d7351228: am 0a23daac: am 166ebd4d: De-parent custom content view...
authorAdam Cohen <adamcohen@google.com>
Thu, 23 Oct 2014 17:31:45 +0000 (17:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 17:31:45 +0000 (17:31 +0000)
commitbe20490b25011fe730824412ab674c447d26ffbe
treecba62d0d64153aa2169651696bc238591341d679
parentd11abc71e9be940db2169eac581e85d913a6c598
parent0008ff9b365460757776fd048e0e45690f5548af
am 0008ff9b: am d7351228: am 0a23daac: am 166ebd4d: De-parent custom content view before adding to custom content screen

* commit '0008ff9b365460757776fd048e0e45690f5548af':