OSDN Git Service

Merge "Fix initialization of field after conflicting merges." into nyc-dev
authorNicolas Geoffray <ngeoffray@google.com>
Fri, 15 Apr 2016 14:55:32 +0000 (14:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Apr 2016 14:55:33 +0000 (14:55 +0000)

Trivial merge