| commit | ea9049a46f3f0dc465378c642cba69b33be0e48d | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 27 20:36:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:36:07 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | b421fa75f2379c509f43002a6dc7a3af5e1fefee [diff] | |
| parent | 74d3b2ce3a924d9c8700332510c122891a585fd2 [diff] |
am 74d3b2ce: am 915cec98: (-s ours) am efbc1bc8: am 32fe0815: am c663f602: am c03cf67e: am a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev * commit '74d3b2ce3a924d9c8700332510c122891a585fd2':