| commit | cb4b00832ca049eeabeeb2fe5f5077921046d943 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Nov 26 18:36:50 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 26 18:36:50 2014 +0000 |
| tree | 276b3631eff2021ace545d0dd770e554e0961b6f | |
| parent | 555d6bf09027fdd4b4a9fa39de369f860965b135 [diff] | |
| parent | 75c06582d9e7f35a2b1606c3b1a9eedc30308b3e [diff] |
Merge "resolved conflicts for merge of eea83981 in lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp