| commit | b6232d90dab6671fd2f116068c3671ae9dff5487 | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Fri Apr 22 18:45:45 2016 +0200 |
| committer | Yohann Roussel <yroussel@google.com> | Fri Apr 22 18:45:45 2016 +0200 |
| tree | 7239ac8b524938fe5ce9ed09bc9e08f19ea54b54 | |
| parent | 7a8e69eea22c34ad6d68b768bea56939c2ec42a9 [diff] | |
| parent | 995b62b2d76344f0c05e8c62e199a123f8f4a027 [diff] |
resolve merge conflicts of 995b62b to nyc-dev-plus-aosp Change-Id: I4293e9f2777fb9b7e2023764703855ff3d778b40