tree 0cd54ab6a7960869a4316c4dc5e3e16867584970
parent 01ba42209149c79f9e5f26a43a988e9ca39c38b2
parent 22e006214cf226261576bb21d33c0cf64175292b
author Chet Haase <chet@google.com> 1472509114 +0000
committer android-build-merger <android-build-merger@google.com> 1472509114 +0000

Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev
am: 22e006214c

Change-Id: I8645ac4cf4cd398f74d77b62b9060a72a87a5411