| commit | e09170b5be3db27f6ec716ee029aba438d67992c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Aug 16 13:17:44 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Sat Aug 16 13:17:44 2014 -0700 |
| tree | 225acea30efc9442421f376a7b29ff144e8a9408 | |
| parent | 3e9b5e192ab47e6761db6b717329054b480d3f24 [diff] | |
| parent | 879f55caa34e81fa1134bf201d54856e90997388 [diff] |
resolved conflicts for merge of 879f55ca to lmp-dev-plus-aosp Change-Id: Ie0f3afb5eac6a9a4129584f8252402c8b2484686