| commit | 469f5ce7250b46648395efd85794df8e492e7e15 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Sep 04 16:26:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 16:26:09 2015 +0000 |
| tree | f8f4e0a216d56d6beefc74fd72ca206aba7563c6 | |
| parent | ad85b58d692c00f787d1ebbc40f69dbd35600e9c [diff] | |
| parent | ba2cf31d780b09e3b665f12459262cd8adbfdc8b [diff] |
am ba2cf31d: am 634b4cc8: am 06b92397: am 2db8b4dc: am bccc13cc: am debc2a5f: resolved conflicts for merge of 6c1149d7 to lmp-dev * commit 'ba2cf31d780b09e3b665f12459262cd8adbfdc8b':