| commit | 9fdb0c3941d91b6f13fc713233e129e7d10deaf8 | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Thu Aug 27 05:12:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:12:27 2015 +0000 |
| tree | c2c06892cfa76053b4b32c222729ce8065a1dacb | |
| parent | 09ba82a3b1d0bea6f02c9f7d494f22331323d275 [diff] | |
| parent | 52fe06327ad019ab90139fd3755f67e0113a6ff5 [diff] |
am 52fe0632: (-s ours) am ae03b007: am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev * commit '52fe06327ad019ab90139fd3755f67e0113a6ff5':