| commit | 0c4007eed2680bf30b26d27676579bdf85f769c3 | [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 | d0cf9c2165c3b4932d90d77984eb32db863b199c [diff] | |
| parent | 704fe2d62895ed591317f4830dc8df2ade640a3e [diff] |
resolve merge conflicts of 4acdde9 to nyc-mr1-dev-plus-aosp am: 704fe2d628 Change-Id: Ib71a0d4192273e6dac1359895619a73632b817d2