| commit | 0cab896a987f6687affd5c50c3bdbe10745c8dff | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Fri Feb 21 16:35:52 2014 -0800 |
| committer | Greg Hackmann <ghackmann@google.com> | Fri Feb 21 16:35:52 2014 -0800 |
| tree | 3034ba6466cc2b82d33fb769a97530ad0962b264 | |
| parent | c866151926b7672a58a7312c8083612bdc567fb4 [diff] | |
| parent | 9e413bf4e562d98b6efeb157369f152edd5f0261 [diff] |
resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e