| commit | 3941bddc6f9fe49cac59b4e5c34f4cd30cc78b1d | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Mon Nov 14 18:09:29 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 14 18:09:35 2016 +0000 |
| tree | 066e80ca1be807ee65b7da8b0cafc50057d4048e | |
| parent | 18fe8f6359a4892f6008ecba4dc357b01ec16568 [diff] | |
| parent | 6b59a74330895050e0c23ef87396a73b78f3ae06 [diff] |
Merge "resolve merge conflicts of 50c5f04 to master"