tree 0625e2156719f3a0e148b340f76b592c7c380de4
parent ac70b483cb372f4b29aa8f02c35e8b53d57b71b8
parent 0c0fc1229b390089869f651a91dd80fb910ba29a
author Alan Viverette <alanv@google.com> 1464187228 +0000
committer android-build-merger <android-build-merger@google.com> 1464187228 +0000

Merge "Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev am: 5c9444216d am: 64432a513c" into nyc-mr1-dev-plus-aosp
am: 0c0fc1229b

* commit '0c0fc1229b390089869f651a91dd80fb910ba29a':

Change-Id: I887fe94a2c68962da5a4096636843e3446a9cd00