| commit | 80b30d77a6d446f7cd405b901a6202fa5b263d9c | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Sat Sep 12 09:45:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 09:45:11 2015 +0000 |
| tree | cfea201952e0a843d5ad787dc038a368c911d94d | |
| parent | d50fb05c6c700b12ae42193a4e662b8f7b9592e9 [diff] | |
| parent | 0d95d4addaa17137d7fbd0f321b8e2a669b4c22f [diff] |
am 0d95d4ad: resolved conflicts for 5365cd9e to lmp-mr1-dev * commit '0d95d4addaa17137d7fbd0f321b8e2a669b4c22f':