| commit | d991bed6f11b830616a967fde54f8d4f1e86eef0 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Oct 15 21:16:16 2014 -0700 |
| committer | Trevor Johns <trevorjohns@google.com> | Wed Oct 15 21:16:16 2014 -0700 |
| tree | 19dec6d3a2036b17538caf32aaa4c6a88155bd89 | |
| parent | 569e9febc5c91d92459579e32df7b948d3e32dff [diff] | |
| parent | 9875ec66e188cbcced9d4cc3334af7846b809587 [diff] |
Resolved conflicts for merge of '9875ec66' into lmp-dev Conflicts: build/sdk.atree Change-Id: Ie195fc75425ccb4ad36e3267627ae66619380505