| commit | 54f4f000c4a148e8605c067019d9a0dd5a8ab223 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Thu Oct 30 15:47:47 2014 -0700 |
| committer | Ian Rogers <irogers@google.com> | Thu Oct 30 15:58:31 2014 -0700 |
| tree | cac19a9b38fa36df345e216bea2512a727a238f2 | |
| parent | c70480b1c4216ac8f8f80c96e247c63dc0e02ac9 [diff] | |
| parent | 473484fac7bd53523f5503176ecc5955325a9731 [diff] |
resolved conflicts for merge of 473484fa to lmp-mr1-dev-plus-aosp Change-Id: Ifaf0c9cd71bc273aec6933db27fbdfefe529ecf5