| commit | ba61a16a12732eac3d905832bd95dc8f97dd46b8 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Thu Aug 14 16:11:33 2014 -0700 |
| committer | Ian Rogers <irogers@google.com> | Thu Aug 14 16:11:33 2014 -0700 |
| tree | 712e9ca1f79d278974332f493b9891cb574aea1e | |
| parent | 2252d61b0c1cfa16ea02069cdd3b2903ec50c83b [diff] | |
| parent | b03bd88d1a55b8e08a1877a88dde8645e9c28013 [diff] |
resolved conflicts for merge of b03bd88d to lmp-dev-plus-aosp Change-Id: I10a96805dab30faea84d790c181c28c967cc038e