| commit | d30c3c2d7526f011abf28e752b45e8aee0a23dd3 | [log] [tgz] |
|---|---|---|
| author | Brian Attwell <brianattwell@google.com> | Thu Sep 25 12:11:58 2014 -0700 |
| committer | Brian Attwell <brianattwell@google.com> | Thu Sep 25 12:11:58 2014 -0700 |
| tree | 689449cb83879f06cef387e0410e98295cea372d | |
| parent | e2f23e3110b09f6ac4c113ff9811cf0e2d2f8a5d [diff] | |
| parent | bccfd553e64b9e497a463dcaeb2d69704660fd82 [diff] |
resolved conflicts for merge of bccfd553 to lmp-mr1-dev-plus-aosp Change-Id: I618ba902bf82d6ef4fef606addea45cb169313cd