| commit | c5b6267dac35300821e6b6e062370d0ee935acc1 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Tue Oct 15 18:59:45 2013 -0400 |
| committer | John Spurlock <jspurlock@google.com> | Tue Oct 15 18:59:45 2013 -0400 |
| tree | c552df730d3e249745ce96ba34b5048c35efe941 | |
| parent | 08ef4050ed9a93563baafa35f312cdb071a57c07 [diff] | |
| parent | e8962d4b2fe066180e5f5425a8251cff30be942c [diff] |
resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp Change-Id: I3b223b9a532f8a154d21d79828b2a95098ab2bd1