| commit | 6e0e8f25d896f55859d33c27bae24937e3be9541 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Nov 14 11:40:13 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Tue Nov 14 11:40:13 2017 -0800 |
| tree | b9f41d4fdafc45bb95f1f9a789e25ada2aaeda24 | |
| parent | 382ea38fc0f6aa4ee3380acdee714ad4cf0fae66 [diff] | |
| parent | 34f5d032f4e38874a51660b316aa1c523471f3f4 [diff] |
Merge commit 'ba1e9e7f7893a079138330d2962ff75c35d4cae2' from oc-mr1-dev-plus-aosp into stage-aosp-master. Change-Id: I1172a1501c65f67b9c2829b739cadeb9e9ff1983