| commit | dd3d95f182a634acdcc1b1e8e4954234d048eb54 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Feb 12 11:05:59 2014 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Wed Feb 12 11:05:59 2014 -0800 |
| tree | 989ee8d51a833038825dc36d38c9bdc7d1463917 | |
| parent | aa318b2851042c6f98723446f33469a6545c7294 [diff] | |
| parent | 4ad93639d210297764db3ffcd870ff38464943de [diff] |
resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0