| commit | 26912851ab3947ef0b25553d28bb2905a9b193cb | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Wed Mar 16 17:33:38 2016 +0100 |
| committer | Yohann Roussel <yroussel@google.com> | Wed Mar 16 17:33:38 2016 +0100 |
| tree | 6175096daf6ea8550191ad8b51c00c71a117426e | |
| parent | d1a30e46d6ce531670726bbb1cf7cb3e2a76b603 [diff] | |
| parent | 63de777488c49a5547a1e3ec7bba53e484714014 [diff] |
resolve merge conflicts of 63de777 to nyc-dev-plus-aosp Change-Id: I5dadd6f7bbf494665f9deb0cfafcce65530825d0