tree 44a9c70d5c8f601029572aaa1033751d035b4a54
parent 2d1d002eea1be7b988f9e39cb6582b74747b4a4b
parent 1a1f6b0b1b345bb110ca642a0caa8b7548c840b7
author Jason Monk <jmonk@google.com> 1465571484 +0000
committer android-build-merger <android-build-merger@google.com> 1465571484 +0000

Merge \"Fix crash in finish from onCreate.\" into nyc-dev
am: 1a1f6b0b1b

Change-Id: Ibd2e867077c2906310dd3b37afe1b9c1ab02de72