| commit | 65fed444879d178f1c196cb5d6d053817d1d8fb0 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Apr 17 14:20:36 2018 +0100 |
| committer | Anton Hansson <hansson@google.com> | Tue Apr 17 15:05:06 2018 +0100 |
| tree | 05ed3fa39f6c5f954d089825239e864e33588899 | |
| parent | 9c39f90593ad60e74a83fa88994962e58206b22c [diff] | |
| parent | 828c8c9fef7e1b7877ce748bb28c02f5c299c5d2 [diff] |
resolve merge conflicts of 828c8c9fef7e1b7877ce748bb28c02f5c299c5d2 to pi-dev-plus-aosp BUG: None Test: ./update_prebuilts.py -p -f 99 4725806 (this is an aosp build) Change-Id: I713b2c5ba51e0ec97cc10cc9e982bd9a01f2aefd Merged-In: Ib1de6f72c09c6aab3b1c0214d3fb35a83d4725c9