| commit | 3a8eac544bafa6256030171fc3ebbd739a02d553 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Dec 22 20:56:56 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 22 20:56:59 2016 +0000 |
| tree | c33157954f047a775ba3987b9474bc0ad5e4666d | |
| parent | 3070dbfae67ab5a1fe9597bac1a196c413f8e310 [diff] | |
| parent | f271c6d266f37d600b65ada8e4e4a32d5044a49a [diff] |
Merge "resolve merge conflicts of b53d984 to master"