tree 3080d570e5ac71a271bb5aecedba3c870aa7428d
parent 09bfc29d1735d275e2ee0a5202a02aee8e01a8d6
parent 7a372a13af0e23e30720cdf29c2ab519cb29d019
author Alan Viverette <alanv@google.com> 1466517229 +0000
committer android-build-merger <android-build-merger@google.com> 1466517229 +0000

Merge \"Only block invalidation in DrawableContainer initialization\" into nyc-dev
am: 7a372a13af

Change-Id: I21a7dbf975a8dca02d87b9a0f084a6af74d55834