| commit | 33d3c53da021f0d044028860ace0f4ad817273f5 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Wed Feb 11 12:37:12 2015 -0800 |
| committer | Alex Klyubin <klyubin@google.com> | Wed Feb 11 12:37:12 2015 -0800 |
| tree | 1ebd67dbfa35109595bd6258633abba7931f1290 | |
| parent | c093955af1434a7023093acb148ab152d915e59c [diff] | |
| parent | 517e0274cb2cfd215b20622280d5e256e8282bbb [diff] |
resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp Change-Id: Ic20b6c8851458483dd73a144bd5ae6e8d141e62a