| commit | c5aa1bc948384a1d17463005dd3c0119a10ea036 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Fri Aug 21 15:49:35 2015 -0700 |
| committer | Stephen Hines <srhines@google.com> | Fri Aug 21 15:49:35 2015 -0700 |
| tree | 46b541dced22ded9e559edaa0fd814a42523d900 | |
| parent | d8f61f201dfc0fe669d45ee2f0d540de3771b984 [diff] | |
| parent | da1173f4e113f56ce369ebf1686180f1fc51b9d0 [diff] |
resolved conflicts for merge of da1173f4 to mnc-dev-plus-aosp Change-Id: Idc2fe892a929ad88432bc1ec8e38599f9ab09c84