| commit | a2f62b6f22c70c7102a3cfc1104cd9cec19ff529 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Thu Aug 27 05:23:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:23:30 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | 6665ae5e9306695cf37883554145d14060ae8728 [diff] | |
| parent | e06c47e24ab069ad0d3ceb9b9cdb673dba432e35 [diff] |
am e06c47e2: (-s ours) am d3f4c398: am 899ad39b: am ba20a086: am bc167f83: resolved conflicts for merge of 84fb58bd to lmp-mr1-dev * commit 'e06c47e24ab069ad0d3ceb9b9cdb673dba432e35':