| commit | 0e61b46673ac3e01492132060b1fab35a73e57d5 | [log] [tgz] |
|---|---|---|
| author | Benoit Lamarche <benoitlamarche@google.com> | Tue Dec 06 11:32:41 2016 +0100 |
| committer | Benoit Lamarche <benoitlamarche@google.com> | Tue Dec 06 11:32:41 2016 +0100 |
| tree | 2beb52b5eb89baee7f83d129db7b1c177aba93f2 | |
| parent | 0deb783a52795faf67bb29f7967d9552d282d016 [diff] | |
| parent | e04c941668ccef612e22c66a323c2ce8995beaba [diff] |
resolve merge conflicts of e04c941 to stage-aosp-master Change-Id: I92ca7c5a10532220031dc799ad8900c9b20dc6fe