| commit | 00e67a25ebfa70f4a714bc0af053912d5f6509d8 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Jan 06 13:46:44 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Fri Jan 06 21:49:39 2017 +0000 |
| tree | d64a467772f198a7ee7527c7654287849eb02a93 | |
| parent | 9c87bdb91c373e11e9cf218122e245387e66530f [diff] | |
| parent | 4c61f95b4220a2a5c82f183bee07c92e87bdcd07 [diff] |
Reset master to upstream 9c87bdb91c373e11e9cf218122e245387e66530f and merge in empty repository history with merge -s ours. BUG: 32016180 Change-Id: I89f016501b6b224ae1e26ccb2c9a72e22937a026