| commit | d230518c0929af757bfbdcc50ab556162e76edd5 | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Mon Nov 21 08:33:50 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 21 08:33:50 2011 -0800 |
| tree | 82521db2bb2004e58e39afb55f4afb78b312fd7a | |
| parent | d8d0c6345f46a61def941ebeb3089cdd9a9803fa [diff] | |
| parent | 5764dca053ac06e8e510b931e19bdc8f02caaccd [diff] |
am 5764dca0: (-s ours) am bb0e59be: resolved conflicts for merge of aca203ff to ics-mr1 * commit '5764dca053ac06e8e510b931e19bdc8f02caaccd': ICS MR0.1 will be version 4.0.2 - do not merge