tree 490e9fef5c0046a2ac205bde0e72b3ad42421f8c
parent b9449e4562024c3de9ae745b75341a8845437484
parent 0890fa57c4b3b854af7ccb513143488e5b35e2ed
author Yuichi Araki <yaraki@google.com> 1475026146 +0000
committer android-build-merger <android-build-merger@google.com> 1475026146 +0000

Merge "Fix setWillNotDraw in ScrimInsetsFrameLayout" into nyc-mr1-dev am: 0a67f0ce0d am: 3adb11fd53
am: 0890fa57c4

Change-Id: I9ce09897341458a1b4150c7f364a4a40ced14fda