| commit | b8fbe8d74faeadc064711e484530c03b2f7a8cac | [log] [tgz] |
|---|---|---|
| author | Tom O'Neill <tomo@google.com> | Tue Aug 20 17:51:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 20 17:51:49 2013 -0700 |
| tree | 8bf0fbd29fa24f307147b4c2903e450c4b501d59 | |
| parent | 4e802a78e6e448eddffd429a1a546597cd79dbc0 [diff] | |
| parent | 1e698982c9277c291e8eeedf1e80d7905040e421 [diff] |
am 1e698982: am a37e2346: Merge "Warn that SettingInjectorService must be fast" into klp-dev * commit '1e698982c9277c291e8eeedf1e80d7905040e421': Warn that SettingInjectorService must be fast