| commit | d8cf85c24923c7e846dd88b3dc5011f97b3844a5 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Mar 18 22:30:10 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 18 22:30:11 2015 +0000 |
| tree | 910eb8943d8babcdabb3e0ec2fc3183b30cdf726 | |
| parent | f2560e62cf26cae64f5751b0479743e09cb7bd7f [diff] | |
| parent | 96d6c40c7159a6e93c21a3b540e24a6ff916cb4b [diff] |
Merge "resolved conflicts for merge of 00de38a1 to master"