| commit | 158b72ab6cac146e655533d84e67a5b1c5a99860 | [log] [tgz] |
|---|---|---|
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | Thu Apr 20 12:34:50 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 20 12:34:51 2017 +0000 |
| tree | 694f74787061c1a31fda75cde51320b75b7c9e30 | |
| parent | de86854896e9bbb3a343c61226013f21e15100a0 [diff] | |
| parent | cc215431569d47c8a30aae693f6e2aeb5b2c9872 [diff] |
Merge "resolve merge conflicts of 68d5ef9aa5 to master"