| commit | 40b4e23a0396614c841977e932218e3f53089a4a | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Tue Jan 27 20:06:33 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 27 20:06:34 2015 +0000 |
| tree | 6b5a1d5c89695f45d475bdbc85b210e9675ea20c | |
| parent | 39d890d9aed5cb07b8a166a749299b9d24d8f137 [diff] | |
| parent | 22d0bdf326de00dd50a388b55540123228cbb025 [diff] |
Merge "resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp