| commit | f6aa4e503692df639cbeb4765dab6bc1a37e342f | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 22 19:21:50 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 22 19:21:50 2018 +0000 |
| tree | 0009ef4ff7566d822fd7a14834f278067dca9328 | |
| parent | 743b38c569d5d1362b46f7382609db526750f29e [diff] | |
| parent | 9978b93630b6c685c07ea6e5874f1af5a3259963 [diff] |
Merge "SF: Fix incompatible proto definitions between pi and master branches"