| commit | 091ff6c0e07393e3449d2c032573ece2ea8fe146 | [log] [tgz] |
|---|---|---|
| author | Robert Sloan <varomodt@google.com> | Fri Jun 23 12:09:47 2017 -0700 |
| committer | Robert Sloan <varomodt@google.com> | Fri Jun 23 12:09:47 2017 -0700 |
| tree | 81f7d8760dddd69af983de96b520e5a5556ec61e | |
| parent | 41bf50cc8b40adc58f1e49bfebd408681389856f [diff] | |
| parent | 2e21f8d8cbbea272dd41afd4b4182b0d7a9c4955 [diff] |
resolve merge conflicts of 2e21f8d8cbbe to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I9c6e9a52e67a06c16b6c8fb6f8eb4647b2fec508