| commit | e39e9350083ec4654dcea0302efc37be79f5228a | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri Apr 15 14:55:32 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 15 14:55:33 2016 +0000 |
| tree | 37e54636ddfed6f82b8e28fb540e08b8afea0f49 | |
| parent | 7aa5d6e452e4acb507a8e4ce24ce2eed7c214c73 [diff] | |
| parent | b6a74d8fea21ec53081bfea478d81f42f6184846 [diff] |
Merge "Fix initialization of field after conflicting merges." into nyc-dev