commit | fea7a4d44cda8a9bb9bbf7ec53760a985e114f64 | [log] [tgz] |
---|---|---|
author | Erik Gilling <konkers@android.com> | Fri Nov 11 20:35:06 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 11 20:35:06 2011 -0800 |
tree | e95e344bfeeced6d289605f88c2a2abd02e581dd | |
parent | 29ea81eb977699a2b026f08d13f213a7d216cb7e [diff] | |
parent | 02f5e8df6897305118349b443fbe7537dc30ff12 [diff] |
Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/build into ics-mr1-plus-aosp