diff options
| author | Alex Cheung <alexcheung@google.com> | 2015-12-23 14:29:03 -0800 |
|---|---|---|
| committer | Alex Cheung <alexcheung@google.com> | 2015-12-23 14:29:03 -0800 |
| commit | 6a80cee0838b485742899edb393d17b40e812931 (patch) | |
| tree | b575f1db164774043661f850db4c15335a40d5f1 /init.bullhead.rc | |
| parent | 1f28be2f2295ff49fa4b0b5cbb1d9b29e01a11a7 (diff) | |
| parent | bdcda932bd0bf24292866071ffa868ddc8293334 (diff) | |
| download | bullhead-6a80cee0838b485742899edb393d17b40e812931.tar.gz | |
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
Diffstat (limited to 'init.bullhead.rc')
0 files changed, 0 insertions, 0 deletions