OSDN Git Service

Merge "Various small crash fixes and guards"
authorJason Monk <jmonk@google.com>
Tue, 10 Nov 2015 20:49:50 +0000 (20:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 10 Nov 2015 20:49:50 +0000 (20:49 +0000)

Trivial merge