| commit | 1bb0461f8657f19fe00f55dd926540121c13fe7c | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Fri Apr 11 02:41:15 2014 -0700 |
| committer | Unsuk Jung <unsuk@google.com> | Fri Apr 11 02:41:15 2014 -0700 |
| tree | 9b471deb215c141f5f58538783e9a71e61dd2bad | |
| parent | 576f80d45e68861675d2e088ae9198bdbb0b9125 [diff] | |
| parent | 353fb28bacefa601424b46af89d44c8a02d908cb [diff] |
resolved conflicts for merge of 353fb28b to klp-modular-dev-plus-aosp Change-Id: Ia5864b955128634f6ed2613ec31f91f4adc50571