OSDN Git Service

Merge "fix startup crash" into gb-ub-photos-carlsbad
authorJohn Hoford <hoford@google.com>
Wed, 11 Sep 2013 00:38:50 +0000 (00:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Sep 2013 00:38:50 +0000 (00:38 +0000)

Trivial merge