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