| commit | 74b464d1deef8af2b3cd35b17a87cdc32af64705 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Oct 17 12:36:14 2017 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Oct 17 12:36:14 2017 -0700 |
| tree | aa6791fa27d9c9e6956d046e9e9ff9960b54192c | |
| parent | f611bf49bbcdacc0fa7668957e9b316e9982ba5d [diff] | |
| parent | 655ec9339f798a5423fa37a0bb04a7c7612bbcbb [diff] |
resolve merge conflicts of 796987482 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: Ica884c137c5f21e261600b2b011ab963036c0cdb