| commit | f6f6d69795e09f6d2c3caeec792701a33dc3ae45 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Nov 14 07:49:32 2014 -0800 |
| committer | Marco Nelissen <marcone@google.com> | Fri Nov 14 07:49:32 2014 -0800 |
| tree | 713f5b07f43152503e996bfea8ff6d8c14f8821c | |
| parent | 19df51c07be6eb8a48b7835e7f5f40a5e35a9982 [diff] | |
| parent | 6c1149d79903fab49660f2e7a0359cb1e904a3d7 [diff] |
resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp. Change-Id: Ia05aa968e5f350c2768fc81491050001fcc94a5d