| commit | b5edbf8679834effaca68eac8d30c3d01ac2634d | [log] [tgz] |
|---|---|---|
| author | Konstantinos Menychtas <kmenychtas@google.com> | Thu Aug 27 05:02:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:02:30 2015 +0000 |
| tree | 5bc92de6f453a0652b1965bdc90e8a78a42a1fcc | |
| parent | cfab01b3101e0ed2fad347c5212353de02783eea [diff] | |
| parent | d2524d00c284e1c7d3735d6ce49e49ed90d223fc [diff] |
am d2524d00: (-s ours) am ca19158e: am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev * commit 'd2524d00c284e1c7d3735d6ce49e49ed90d223fc':