| commit | 95a7311ac561fd644b5e67debfeb3e210eba7784 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Jun 26 23:06:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:06:46 2015 +0000 |
| tree | 7e057316b2e76bf8185ef0e3ec1250c2ee0126af | |
| parent | 742f5832b16328372d47ae062b3ab946ff37b6f6 [diff] | |
| parent | 78d1cba0f42d023483e64d5c7b6f9e1c8b236ed4 [diff] |
am 78d1cba0: (-s ours) Fix conflict resolving error in ef5dc90bba179f774bee0c7e479965cef12091de * commit '78d1cba0f42d023483e64d5c7b6f9e1c8b236ed4': Fix conflict resolving error in ef5dc90bba179f774bee0c7e479965cef12091de