| commit | f773d127849b25838df032bced80ecf9f98a0633 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Mar 04 11:35:19 2014 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Tue Mar 04 11:35:19 2014 -0800 |
| tree | 78fd6e49297cd4e61cabddfaab87a25a433ef252 | |
| parent | 7cd7ad5216d4c4946ebbefc78382ef78d510afc1 [diff] | |
| parent | 4bf3bb679a37f4aa77a51f452b37cf9a3d142f13 [diff] |
resolved conflicts for merge of 4bf3bb67 to klp-modular-dev-plus-aosp Change-Id: I20b005efaa84d86d22f6af7a81ade36a606a1d21