| commit | 77bfacc6fe0816e97be3a0f9a824759629d1f9eb | [log] [tgz] |
|---|---|---|
| author | xinhe <xinhe@google.com> | Wed Nov 19 22:50:41 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 19 22:50:43 2014 +0000 |
| tree | e86a3e857fd39449231d8f2b63a5edf12b144a32 | |
| parent | c70a4ccf45f669c07345cd438d68747d0558fd49 [diff] | |
| parent | b4e8478a736552b269a5810f492fb9652b68e71e [diff] |
Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev