| commit | 88815f56233b6811ee7d25dae34b231d5fa72a00 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Sep 15 04:25:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 04:25:41 2015 +0000 |
| tree | c62a1036117a8611d340edac0f1ca3fd18cc29de | |
| parent | 22970ce7d6e364bb4062f5c0f6f97cca8b7e974b [diff] | |
| parent | 4da739b3d8fd46de77e02e3656fb7bdcb7993d2d [diff] |
am 4da739b3: am 8a21a3cc: am 83021069: resolved conflicts for 8b963c52 to lmp-dev * commit '4da739b3d8fd46de77e02e3656fb7bdcb7993d2d':