| commit | 882f4e1f444194405ef78a3a9d5c1618cb8a8013 | [log] [tgz] |
|---|---|---|
| author | Shaotang Li <shaotangli@google.com> | Thu Aug 30 12:29:13 2018 +0800 |
| committer | Shaotang Li <shaotangli@google.com> | Thu Aug 30 05:26:19 2018 +0000 |
| tree | 209325b8ab9541aeea6a121b1d375e3f8fc12c14 | |
| parent | 62ced9c2d898c25f64db8c07e1db2ff7cf907101 [diff] | |
| parent | b825510b80a6d8db12590f2f0995bddf97970946 [diff] |
resolve merge conflicts of b825510b80a6d8db12590f2f0995bddf97970946 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I3dd8e3f70d648fc37811d80f4f1356687a4df1b8 Merged-In: I2eb6965238e37435bb380fb4a0e616bd1da6dae6