| commit | 44748f2c6a25b273b75c56018741fc854119931c | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Jul 21 16:33:14 2014 -0700 |
| committer | Colin Cross <ccross@android.com> | Mon Jul 21 16:33:14 2014 -0700 |
| tree | 85b259a384ead672e267ddb13ce43adf31da8372 | |
| parent | 748521108498283556250f8e9ea0a0ecdbbd6c43 [diff] | |
| parent | ad1e41d48c86b0a269cbf17d5e4c5d5cf118fa65 [diff] |
resolved conflicts for merge of ad1e41d4 to lmp-dev-plus-aosp Change-Id: Ie99f6cc68a613eb287048f17bd423a8f80762645