OSDN Git Service

am 0a23daac: am 166ebd4d: De-parent custom content view before adding to custom conte...
authorAdam Cohen <adamcohen@google.com>
Fri, 14 Feb 2014 20:38:16 +0000 (20:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 20:38:16 +0000 (20:38 +0000)
* commit '0a23daaca14ab7fd107ee3e4043b5793760e02c1':
  De-parent custom content view before adding to custom content screen


Trivial merge