am 77e68484: am 05abe8d0: am 131564d2: Merge change I3bbfb4f9 into eclair

Merge commit '77e68484f5592e06ca1a881745070f7931641246'

* commit '77e68484f5592e06ca1a881745070f7931641246':
  Remove unused field and add new API to control the children drawing order.