| commit | 9902b683347f83ca427fedaee249850630a010b0 | [log] [tgz] |
|---|---|---|
| author | junyulai <junyulai@google.com> | Mon Jan 21 16:58:27 2019 +0800 |
| committer | Junyu Lai <junyulai@google.com> | Mon Jan 21 12:22:13 2019 +0000 |
| tree | b0a149f4412a56f1bde236e1acbaa9b671c52c65 | |
| parent | 346e7b658be27c8c87bdda10899550d2d8b02d04 [diff] | |
| parent | da290bec0c5418e758b92abad7be8e729cf37d68 [diff] |
resolve merge conflicts of da290bec0c5418e758b92abad7be8e729cf37d68 to stage-aosp-master Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I719965f13d1f726fdac5b475fd8733b07e28f5b6 Merged-In: I3d94acb71c142ec38b750e58822881ff383341cc