OSDN Git Service

Merge "Fix potential crash loop" into nyc-dev
authorMakoto Onuki <omakoto@google.com>
Fri, 25 Mar 2016 18:55:32 +0000 (18:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 25 Mar 2016 18:55:33 +0000 (18:55 +0000)

Trivial merge