| commit | 878141321e60837466de0580b38a11fd5e89f86b | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Apr 24 21:25:31 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 24 21:25:33 2015 +0000 |
| tree | 15938f992cb426cc45ce3742c03cb6d58d0196b7 | |
| parent | 0d16b908c37765c1a4e36f4dd58caddbb6d99cf8 [diff] | |
| parent | 40485f5aac5bc02fb3b24ad03ac71f724e4c340a [diff] |
Merge "resolved conflicts for merge of f9c14b7d to master"