| commit | 0c68be8c427f978aad8800e64460351cd12506f3 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Oct 06 11:48:44 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Mon Oct 06 11:48:44 2014 -0700 |
| tree | 98d64ceece0a9a37e6ce788641826520a1ce8980 | |
| parent | 4c0a07b152e10a3b0ccdb842321ea66cc7b2115a [diff] | |
| parent | 55c2adfffac9b40992316938699cb36e0818fbbb [diff] |
resolved conflicts for merge of 55c2adff to lmp-mr1-dev-plus-aosp Change-Id: Iaa9ac54a065109e877a2f3f88ef740193f97398c