| commit | c16f0486fca0df1125cc381d3f4ef3b652d72d29 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Sep 02 22:02:48 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Tue Sep 02 22:02:48 2014 -0700 |
| tree | ecd28f809d0c68cba697afc65f6c2cbe9323aebd | |
| parent | 69fde6b4a7c7674c8bbc8fba0b82bcc25fdf0539 [diff] | |
| parent | 2b10e2f12262c5ac5d8dac4f0bfc16b1848cbfec [diff] |
resolved conflicts for merge of 2b10e2f1 to lmp-dev-plus-aosp Change-Id: Ia41583773abbbe1f52d72d1e7f4b925e621d28ff