| commit | b3358a7f9b36f15314d8ffcfcb5107598c8b8cc6 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Sat Apr 21 11:40:21 2018 +0900 |
| committer | Jiyong Park <jiyong@google.com> | Sat Apr 21 11:40:21 2018 +0900 |
| tree | 8830c2f4cc67193df67ed5ace215189b89812d20 | |
| parent | f4f01aafa5d45d2c5b1acb80bba9fcaa64e70e61 [diff] | |
| parent | 1ec43c9c3e6a486cd2d1438f158eea1a27bb6007 [diff] |
resolve merge conflicts of 1ec43c9c3e6a486cd2d1438f158eea1a27bb6007 to pi-dev-plus-aosp BUG: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia022f34c839539aab4a18ca331f22165d1abfaff