commit | 6bb73856ee6d632cdaab5af6c3108770545b89cf | [log] [tgz] |
---|---|---|
author | Pavel Zhamaitsiak <pavelz@google.com> | Tue Jan 12 23:44:08 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 12 23:44:08 2016 +0000 |
tree | 744aa3f2e50423882ed156b813c7fdd0bb421f48 | |
parent | 27182321dc1e3d3e9dacc01d68228cbdc1da0d25 [diff] | |
parent | 95a0c7c8e63ab0a53ba1b225effe593c71b9ddb7 [diff] |
Merge "resolve merge conflicts of 68514d5325 to master."