| commit | 76e0bba86b21ccca1013f1cbc838db6f4848aefc | [log] [tgz] |
|---|---|---|
| author | lifr <lifr@google.com> | Tue Jan 15 17:18:00 2019 +0800 |
| committer | lifr <lifr@google.com> | Tue Jan 15 17:53:02 2019 +0800 |
| tree | 93080cba2006ec2c810bea2ba02b276a8e2e228a | |
| parent | aacc94e7fd455d166c1519c5fcc968fc719ce6dc [diff] | |
| parent | 2b208601c2a454220e0d49be4ac607f45079a7a2 [diff] |
resolve merge conflicts of 2b208601c2a454220e0d49be4ac607f45079a7a2 to pi-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I57b03766b585bb38e657e772dc4d6c3ad69a5237 Merged-in: I4588cec0dea8a4c5a19847a32a6d53bfc5953be7