| commit | 5e883b3b37e7203f712174ed46b7a04eb19ea3da | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Dec 04 09:13:40 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 04 09:13:41 2014 +0000 |
| tree | 5fa15b78d8bd152a6d917bb8daa9a3504b1f98d3 | |
| parent | 24f17f0b94341c84ca017598089bdb52e44e1f6a [diff] | |
| parent | 111a62edabe7342cca394b80ef3249105004ae02 [diff] |
Merge "resolved conflicts for merge of e6af9327 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp