| commit | 215acfe15d365490a58ae7d2ccfa61457f1079c2 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Oct 24 12:51:12 2016 -0700 |
| committer | Xin Li <delphij@google.com> | Mon Oct 24 12:54:20 2016 -0700 |
| tree | da4e55ca45a72815dab3dc5a5eba7f4149188347 | |
| parent | 4d418b1e08cb312a93ce50e35d2f314c66ce787b [diff] | |
| parent | 0ee94211e95096750ede752acd13b163aa6d5046 [diff] |
Merge in upstream history as of '0ee94211e95096750ede752acd13b163aa6d5046' with git merge -s ours. This will make future merge easier. BUG: 32336081 Change-Id: I2a61c91d9bd2bd3547575e377c5a0647e07e0963