| commit | bb5ec4a9260ad6140452dff90564a289da12b567 | [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 | 9c767212ebd9c12ec0e3242b5e01e2bf041b08c3 [diff] | |
| parent | 796987482f3a56c4bc7ab7500a5dbe033ff11ae1 [diff] |
resolve merge conflicts of 796987482 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: Ica884c137c5f21e261600b2b011ab963036c0cdb