| commit | d36d82a117d4287295ddfe1c4730e4324f6b885e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Apr 03 10:48:05 2017 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Apr 03 10:48:05 2017 -0700 |
| tree | 8cefa58b5bf6b513f30ebbcb9943c448105ee8e7 | |
| parent | 23854148f64165b5155bd7d1d4812b015c16c878 [diff] | |
| parent | 7206a3b38c82242c56c43af39c662b9ee2c7ebf2 [diff] |
resolve merge conflicts of 7206a3b38c to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ib00dfc08b1ca7223d49b18fceab780c5dbec0d7e