| commit | bdcf5e8f16097107efa236b6fea76a9db8716daf | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 13 21:48:29 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Aug 13 21:48:29 2014 -0700 |
| tree | 2dd8200ccc5214abe114d294a3702f56ad5805c4 | |
| parent | bb5a79de5a305849137af8248ba3820c470b3ce9 [diff] | |
| parent | 708e65a9521667eeba62945e418deabc70423f52 [diff] |
resolved conflicts for merge of 708e65a9 to lmp-dev-plus-aosp Change-Id: I065a9984499534b87d105ff8f7c2d2c54f1280c4