| commit | a70d26157b36afe45eb201c96eaf39f86966635e | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Fri Dec 11 15:35:18 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Dec 11 15:35:18 2015 +0000 |
| tree | 2519fcac6aa9d4051eb29ac45f12287b884682e9 | |
| parent | 9547da037ae1a96b67e9410b25e236ce3efe5849 [diff] | |
| parent | f55d402132afa4b9dd38aa69e50ec7b7efb1927c [diff] |
Merge "resolve merge conflicts of 01c1129fe6 to master."