OSDN Git Service

am bb0e59be: resolved conflicts for merge of aca203ff to ics-mr1
authorBart Sears <bsears@google.com>
Mon, 21 Nov 2011 16:31:56 +0000 (08:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Nov 2011 16:31:56 +0000 (08:31 -0800)
commit5764dca053ac06e8e510b931e19bdc8f02caaccd
tree4369d1c991919b1b7a927a97971166d126725de9
parent14c2d2c1f77c0b4713cf406e941fbcb5d28bb90d
parentbb0e59be7c01fd9eb85d81b92c0527bac5402d1d
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