| commit | dba909bd9e98cc6ecc9c786eeafe8b8613d38bae | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Wed Jul 13 15:23:45 2016 -0400 |
| committer | Jorge Lucangeli Obes <jorgelo@google.com> | Wed Jul 13 15:23:45 2016 -0400 |
| tree | 106bcec696c7215707b17653af581db6460af5a1 | |
| parent | 79233b4169ea54f63ff44951f5298b103800831b [diff] | |
| parent | 1b9b27351ab5f9d30d9e080a729fbf5cda92d03b [diff] |
resolve merge conflicts of 1b9b273 to stage-aosp-master Change-Id: I12a541cb698d1df866b8be4dc1e35cb99e6f1e64