| commit | dcc0eb31c39e876afdbcbc61be5056ed2c486291 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Mon Dec 12 19:15:14 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 12 19:15:15 2016 +0000 |
| tree | 5c70f0d0ca8ad7666ee597cedf8401b7c10ce46e | |
| parent | 63ffc488b2f92c03f2486eeb6ccc6580cac5f86c [diff] | |
| parent | 20a4ecf4b5d5b347fabd73fa047b591b2721c826 [diff] |
Merge "resolve merge conflicts of 232bf85 to master"