| commit | 567caee263b68aa3a2bb3b8e8249d1c3baa6e61f | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Fri Jul 29 16:22:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 29 16:22:50 2016 +0000 |
| tree | 9ceade44c6647320bfb3eac9f29f7ff8db11f8be | |
| parent | dbf32e3decb2d189e73116ff2e48af7e39e3763d [diff] | |
| parent | d3cdfafede3c73b53172615330d4d9d93f329b8b [diff] |
resolve merge conflicts of 4acdde9 to nyc-mr1-dev-plus-aosp am: 704fe2d628 Change-Id: Ib71a0d4192273e6dac1359895619a73632b817d2