| commit | bb07939f62417e0fc266ecf39d78c4a123c7cbb1 | [log] [tgz] |
|---|---|---|
| author | Jaegeuk Kim <jaegeuk@google.com> | Thu Oct 11 20:49:33 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 11 20:49:33 2018 -0700 |
| tree | d17a5d69f5d70420449c57d439d29de476ac2c28 | |
| parent | 4fe3e1952f71f8841d6916b879c37833ed47596f [diff] | |
| parent | dc648045df93fab743017e0084fb6a0caf9cf157 [diff] |
[automerger skipped] Merge changes from topic "discard" into oc-dev am: de5e727bf3 -s ours am: 63923ab714 -s ours am: dc648045df -s ours Change-Id: I82a964db21f192803960d2d09e0493c6c35051f7