| commit | e1261d853372beaa823b576bf88c799b7573f4bf | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Aug 03 19:25:51 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 03 19:25:52 2016 +0000 |
| tree | 64dc6f3e2506e3d5c3651167c2e92e8ca23d176f | |
| parent | 7475ba9a7d3b3156d192f60d211a1784146678fe [diff] | |
| parent | 526694ea52fae88a10afc6f6c975912358d745f6 [diff] |
Merge "resolve merge conflicts of 3c1b0f0 to master"