| commit | b5952289e2dd0d84671881422a60df305193e964 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Sun Jan 23 23:25:47 2011 -0800 |
| committer | The Android Automerger <android-build@android.com> | Sun Jan 23 23:25:47 2011 -0800 |
| tree | f9c45abc3d5eb8745897cc269aae0d0c4c0543a9 | |
| parent | 1d4e3fdeb4d31c12e0d533eb50e335691a4956dc [diff] | |
| parent | 733ce0d0cc0431d254eea11a044210dc24b11e08 [diff] |
resolved conflicts for merge of 733ce0d0 to honeycomb-plus-aosp Change-Id: Ic962c4e2611c31af1da96269d70216b27aa3a18d