| commit | 5550099d34f97ad49cc10ccee7747d6951607e78 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Sep 16 11:44:28 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Tue Sep 16 11:44:28 2014 -0700 |
| tree | abe5a964dd149a09fca5719461c5969446740ed4 | |
| parent | c18dec135436db84c5d5a7743f771f2aecf8c36e [diff] | |
| parent | d2e5a6934ca1a07c9e1e87d3d0b21b63e1011934 [diff] |
resolved conflicts for merge of d2e5a693 to lmp-dev-plus-aosp Change-Id: If834354fbf8b022487bf6d50fc08125a20726012