| commit | 08df25419fd797aa0e8c22fc376fd8d3e071f0b9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Sep 08 11:41:30 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Sep 08 11:41:30 2014 -0700 |
| tree | a9b2734817b2b0351f99d36a6b3db9eb74140a32 | |
| parent | ffa8672bd5722b9bb2f13dcabffb2814b2edd0ea [diff] | |
| parent | c8f6b82f87d9e4ea385ce6d634220b369b76845a [diff] |
resolved conflicts for merge of c8f6b82f to lmp-dev-plus-aosp Change-Id: I03a4645eb5fbb54e41da25018729b270ba0ed48e