| commit | f06e08b3ad35b06d758a852610459f4af81029bb | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Jan 06 14:02:09 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Fri Jan 06 14:03:08 2017 -0800 |
| tree | 4efab98ebdd34f6774d6b97fc21df2b75f98de1a | |
| parent | eb237873f4a3eedadbbe70bd0b05dffb9839cca5 [diff] | |
| parent | b602da46f32b622064c4db4ce7f9220cf011511d [diff] |
Reset master to upstream 0eb237873f4a3eedadbbe70bd0b05dffb9839cca5 and merge in empty repository history with merge -s ours. BUG: 3201618 Change-Id: I3d600189149764313a3aad809f7c2d9b1af1481c