| commit | 682ed6b60807d5fa971dbd6c76deae788cb65df4 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Nov 21 21:48:46 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Nov 21 21:48:47 2014 +0000 |
| tree | 0d58825018b2d36d1f12238f8f3ce80c936d2c5a | |
| parent | 2dafe6664a7dd6d9aa227b0779a90891c2b1b2ef [diff] | |
| parent | 9ef94019386183cb88ad090965418ef294bbb79a [diff] |
Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev