| commit | 0f4bc4f832167ff702c854fa41c391f0663e75b2 | [log] [tgz] |
|---|---|---|
| author | Greg Hartman <ghartman@google.com> | Fri Sep 14 10:49:37 2018 -0700 |
| committer | Greg Hartman <ghartman@google.com> | Fri Sep 14 10:49:37 2018 -0700 |
| tree | 7702658bc251d61c377ca798ced6cb3125044b8f | |
| parent | 0e13134f1c1ace93fe08255e437ae266ddb0816a [diff] | |
| parent | bf6d51a4ef57b08ff26533ccc127068adad9bd3b [diff] |
Pacify the automerger This is a noop merge on both sides to allow us to engage the automerger between the AOSP and internal trees. BUG: 114488854 Test: Automerger should clear Change-Id: I237a4377fa18bb2bd78bbab1123ad24751621695