| commit | baefbfdb55f18846aa72b386c7e6e11442a6b090 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Fri Dec 17 13:44:54 2010 -0800 |
| committer | The Android Automerger <android-build@android.com> | Fri Dec 17 13:44:54 2010 -0800 |
| tree | 70db7a6f8a462c75fb181ba6ccf6eedf622ef285 | |
| parent | 01bb100fef3e909fdbee5ee0766fbc1061f9135f [diff] | |
| parent | 1d9c213a7f9c8066c5f2ef8fd0b93408c4869321 [diff] |
Merge branch 'master' into honeycomb-release * master: Re-enabling clipping of children in cell layout (not necessary now that hotdog is out). Fix mipmap generation with RS API update. Removing "phone" from the only string that used it