| commit | 8bfbc012cba41c353456c64aae3a01181e6c9779 | [log] [tgz] |
|---|---|---|
| author | Gustav Sennton <gsennton@google.com> | Fri Jun 17 10:49:53 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 17 10:49:54 2016 +0000 |
| tree | 866f3c3744a30d342255a7c70d64810a2543a4fa | |
| parent | 99a8e2faac20b3480ada3e9ded7af136640127ce [diff] | |
| parent | fd222fc2f8c27ebea1bad050f6fd61ab3b954ea2 [diff] |
Merge "resolve merge conflicts of 6cbf137 to master"