| commit | 00b022ca2574d3eeacd411e79077203ddc7654e2 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Thu Sep 11 23:20:41 2014 -0700 |
| committer | Mathieu Chartier <mathieuc@google.com> | Thu Sep 11 23:20:41 2014 -0700 |
| tree | 9fdaaada7ee9ba5e8c80453cd7efabf4eb2d6a38 | |
| parent | 624eb194f290fda131f69ec1d4c831a619e3c655 [diff] | |
| parent | d0ceb5499f225f83e92c849eb04e7adb527eb2e3 [diff] |
resolved conflicts for merge of d0ceb549 to lmp-dev-plus-aosp Change-Id: Ia0e6af178bfb0a8ecf655777d348912b74adfe4f