| commit | c430db9ebf602c9097e9d6a68102a26361448375 | [log] [tgz] |
|---|---|---|
| author | Rose Liu <rongliu@google.com> | Mon Mar 26 21:05:12 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 26 21:05:12 2018 +0000 |
| tree | 9c86910ef4ceb0c92eb6eed5775070b3cf7fa624 | |
| parent | 27769ab2e1d09607c21daa1e372b344666f36b13 [diff] | |
| parent | cfb187b458858013453019f62c8cbf29a0a8d623 [diff] |
Merge "Manual merge of ag/3738015 because of conflicts. Conflicts are in layers.proto, LayerProtoParser.h and LayerProtoPraser.cpp as master has more fields in layer proto than pi-dev."