| commit | 8daabceb2efddebe2e7c0b2425ad9f8ef62c0a5c | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Oct 01 23:34:43 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Wed Oct 01 23:35:41 2014 -0700 |
| tree | 230e918cee633aa61318edf50e902c44e4a84fde | |
| parent | 9f905f37b229294753ef08ee104a00f611de450f [diff] | |
| parent | 1dcc75b2dbaef7c3bb3410187bf38cabca0d1aea [diff] |
resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp Change-Id: I8e1c6ee2025b6acd90803545fb95ab1b98560d92