| commit | 0124980e9fe2f5d21748254441229820cca6b601 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Sun Nov 30 21:15:34 2014 -0800 |
| committer | Craig Mautner <cmautner@google.com> | Sun Nov 30 21:16:39 2014 -0800 |
| tree | bc47f0ebf7d2063c97783ac89d59e4646a94e58d | |
| parent | 29e1c36d4b57854a34c5db43e37282b867bf149b [diff] | |
| parent | 082c0540e9ac5281dfc0237d08de5f3c6de21ce1 [diff] |
resolved conflicts for merge of 082c0540 to lmp-mr1-dev-plus-aosp Change-Id: I93543a420eba5c6ae860a81a9afd9a2189d88903