| commit | e81224d80c3af797003a40f06fc7563728a0da96 | [log] [tgz] |
|---|---|---|
| author | Lei Yu <jackqdyulei@google.com> | Thu Oct 25 14:20:08 2018 -0700 |
| committer | Lei Yu <jackqdyulei@google.com> | Thu Oct 25 14:25:21 2018 -0700 |
| tree | 6bcd5d7c5f2172eee9ac4093931eb33bdc38b86c | |
| parent | 816e75fbc3b3efe75babc66e06cda03cfd7d751b [diff] | |
| parent | 7849607a7ca9518f57fb22cca5665b88e99134c2 [diff] |
resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus-aosp Bug: 115707279 Test: I solemnly swear I tested this conflict resolution. Change-Id: Ifd8f2c090ccd9eadbc7b789b927550bce732f1d1 Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389