| commit | 3abcb7b7781b73356f06090102a2a75cfd086449 | [log] [tgz] |
|---|---|---|
| author | Kenny Guy <kennyguy@google.com> | Fri Feb 06 00:07:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 06 00:07:51 2015 +0000 |
| tree | 8f70cfe77ea9e3d016ba9826c8608395c86c7dcc | |
| parent | 7f7a2812d9cdc1af4906fea7e6e07f32c163c0dd [diff] | |
| parent | a26fde696f90036da472aa78175e183dd2bbb675 [diff] |
am a26fde69: resolved conflicts for merge of d101eb99 to lmp-mr1-dev * commit 'a26fde696f90036da472aa78175e183dd2bbb675': Tests for LauncherApps