| commit | 47c23a228deb2fa2e7158c58fc42441e8517ea38 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Oct 01 13:52:49 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Wed Oct 01 13:52:49 2014 -0700 |
| tree | 692629c9de9597279eb24c75b4aebb3ac2ad395a | |
| parent | 7ed7afb51ec2c415c8de8266ea8d38b9a00cdcd0 [diff] | |
| parent | fe50cfd53309af4dd49e572bd4a3120ea1494029 [diff] |
resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aosp Change-Id: Id09c2786db18fa7e747cd1652ea95f575c3f5c46