| commit | 25d580912de82d0e359182b36b5c519f5a0d6766 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Jun 23 10:35:49 2016 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Thu Jun 23 10:35:49 2016 +0200 |
| tree | 1bfbded257abaafe163ea0a09326a8b24d712e40 | |
| parent | c963b671f3f9e703894cbbdb7dca914eaee876f0 [diff] | |
| parent | ccd27b02bfee6db992bc6590270640403103366a [diff] |
resolve merge conflicts of ccd27b0 to stage-aosp-master Change-Id: Ic5a6bb461c60646d7f9798cb1bf99110c6592f91