| commit | 0da89b76402816dade084166a97b1d352ae1f78b | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Tue Nov 25 15:34:56 2014 +0100 |
| committer | Jorim Jaggi <jjaggi@google.com> | Tue Nov 25 15:34:56 2014 +0100 |
| tree | ce3298639cfc656c3f52f2a0317924b1b99b0cdf | |
| parent | b4c5410987a6657b71fb0b86e1ef8337628241dc [diff] | |
| parent | f0fc23a14170cdd37d4ae641293d6e87b846680a [diff] |
resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1