| commit | 37cc29e95684de126693f59e91703b2af57e7659 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Oct 18 17:56:50 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Oct 18 17:56:50 2013 -0700 |
| tree | 4778147e265ecd4cb6dc526c605bea40ea8b145d | |
| parent | 9b41f452013123d0a394e696f597467da73108ed [diff] | |
| parent | 9ff588f84b855b7d00d259a07e13d6707a95647b [diff] |
resolved conflicts for merge of 9ff588f8 to klp-dev-plus-aosp Change-Id: I0250174055a16bc2d35ede1f6a0a7f033bb3c844