| commit | fc6d9c57b10ed1445360eed87deedaa4e4734f38 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 28 10:55:24 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 10:55:24 2012 -0700 |
| tree | 36b0975ba2f43ec2050a44df94e2920e1b12277f | |
| parent | 5e5272a43eb0bbcdcae264362beecafc03234c4b [diff] | |
| parent | 06fba2bfad1e9e5a33462992d7d8b425be8da804 [diff] |
am 06fba2bf: resolved conflicts for merge of 2e537299 to jb-dev-plus-aosp * commit '06fba2bfad1e9e5a33462992d7d8b425be8da804': Update blob list, add matching self-extractors