| commit | 5764dca053ac06e8e510b931e19bdc8f02caaccd | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Mon Nov 21 08:31:56 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 21 08:31:56 2011 -0800 |
| tree | 4369d1c991919b1b7a927a97971166d126725de9 | |
| parent | 14c2d2c1f77c0b4713cf406e941fbcb5d28bb90d [diff] | |
| parent | bb0e59be7c01fd9eb85d81b92c0527bac5402d1d [diff] |
am bb0e59be: resolved conflicts for merge of aca203ff to ics-mr1 * commit 'bb0e59be7c01fd9eb85d81b92c0527bac5402d1d': ICS MR0.1 will be version 4.0.2 - do not merge