| commit | bf3a0defbee38738f4ce36f4c93435a56a45e925 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Mon May 07 16:49:35 2018 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Tue May 08 00:00:20 2018 +0000 |
| tree | 9b467d98a22b555fb856600c3b940df3d9b77bf8 | |
| parent | 976dd37c3d3189e0f5f84a4cc25ff0772d84812b [diff] | |
| parent | 8fcf74f948f8167db3a2f6f5e846c74e9eeedfec [diff] |
resolve merge conflicts of 8fcf74f948f8167db3a2f6f5e846c74e9eeedfec to pi-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: None Merged-In: Ica9be3b2d588ff63eb0c81e8542a45b870db4536 Change-Id: I72a1a54377969124732b17569c6cddeb8650e7eb