| commit | 43bb117a80c78539499b04304eb6fd9707135981 | [log] [tgz] |
|---|---|---|
| author | Hui Yu <huiyu@google.com> | Mon Jan 07 14:35:07 2019 -0800 |
| committer | Hui Yu <huiyu@google.com> | Tue Jan 08 19:39:24 2019 +0000 |
| tree | 8db79c7f632df953d9386974702362302e82beca | |
| parent | 67a1ddd9bf134c34d09cbc6f015b430a1135fe85 [diff] | |
| parent | 7fbf27c91af1621264154cc09f0fdafb3ba69ed3 [diff] |
resolve merge conflicts of 7fbf27c91af1621264154cc09f0fdafb3ba69ed3 to pi-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I51ef1960dfbbb864233be1abfea4b3fb468032d3 Merged-In: 7fbf27c91af1621264154cc09f0fdafb3ba69ed3 Merged-In: Iad8c3d1d74d8591a75a4c033c8bf9d3956d2fe4f