| commit | 0e864bbcee7441fa8dadcc702563b4b6356a5358 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Aug 31 22:19:23 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 31 22:19:25 2016 +0000 |
| tree | 328ca729e57931f4980f88f2267391a1f448758c | |
| parent | 5b0434ae7bff5c57dbead006c81c6125ccb05214 [diff] | |
| parent | 32cbdcc8c098b4a42212b3da345b929abad8ad6e [diff] |
Merge "resolve merge conflicts of c5bafe2 to master"