| commit | 78daa7208345a8de4483d8235f0b4bebcb9b8a72 | [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 | b99894e0bceeec371cee57342f4ca2a9ddd7c86b [diff] | |
| parent | d392beae19e586c792c3c61541a48ef1c0a65a56 [diff] |
resolve merge conflicts of 1b9b273 to stage-aosp-master Change-Id: I12a541cb698d1df866b8be4dc1e35cb99e6f1e64