| commit | 4037c458a7594cb3cd81a14e7e974abc28180187 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Nov 13 14:59:49 2014 -0800 |
| committer | Andreas Gampe <agampe@google.com> | Thu Nov 13 15:16:53 2014 -0800 |
| tree | 0c67eda2af312b22742cf984258095cfbac5b211 | |
| parent | c5657b0c344b39d794c4c8241004d4e19341c096 [diff] | |
| parent | 07dffa184fc308bdeff90ab047810405c6bf4684 [diff] |
resolved conflicts for merge of 07dffa18 to lmp-mr1-dev-plus-aosp Change-Id: I42d8bc291f4f48f3098754b076889159c4b20e41