| commit | b5a988086b7e6c1677640e297b5323adbd212a16 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Thu Aug 30 10:19:30 2012 -0500 |
| committer | Jeff Hamilton <jham@android.com> | Thu Aug 30 10:19:30 2012 -0500 |
| tree | b69ed1e36a05291e9157e319bf7fc2bbdc328028 | |
| parent | 6aa428d59fac17013597689fcb9741877d13281c [diff] | |
| parent | 72ce82e8e05446aa3b7e163c84d4c23e58552ad6 [diff] |
Merge branch 'goog/froyo-ub-gcore-asiago' into jb-mr1-dev This brings over changes for creating ProGuard keep lists aimed at obfuscating @hide's out of static libraries. It also includes changes from code.google.com to support federation, and local fixes for federation support as well.