| commit | dc84c6ca86290393fec2bb730f125575ee9e168e | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Sep 04 15:43:11 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Thu Sep 04 16:15:52 2014 -0700 |
| tree | 0e3ee16008207234235760418d420840bea084d7 | |
| parent | 2d0368a775193230c8df41084868b485effcaa3c [diff] | |
| parent | 82ad9ec3d107a91370ec4e98bf795e75db020bf9 [diff] |
resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp Change-Id: I7ae05c4f1b072906932a9ed47bdbad881b8e0d37