| commit | 781bff8c80842cbfb52b4ba50a1de64b1139da93 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Oct 01 23:17:19 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Tue Oct 01 23:17:24 2013 -0700 |
| tree | 1980092e4f8fc4048f3be31bf544d73877566602 | |
| parent | 351fb0f36e37ea38a90c5143def559e99e6305db [diff] | |
| parent | 07ff0fc6bfef230a53b5f0aeff3f187282d13773 [diff] |
resolved conflicts for merge of 07ff0fc6 to klp-dev-plus-aosp Change-Id: I9e356afc8bb37a5c03cd025d2bfe9e897bbe5478