Merge "Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am: 0f1ae5fa0f am: ae2a646295" into nyc-mr1-dev-plus-aosp
am: 144a044308
* commit '144a044308f313d533af99e101638b7ef1e12773':
Change-Id: I154d727b70f8d3f255f9a8709386541c12647612
This commit is contained in: