Reconcile with gingerbread-release honeycomb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 May 2011 21:14:51 +0000 (14:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 May 2011 21:14:51 +0000 (14:14 -0700)
commitb1c28e3dc892817c8d9fea2bea0bcee7796dfa93
treed8c107d6b6ebb0d3cf312d6979f7ad65cdcdf514
parent3fb34dc34e5b352d52b769fd3b695fbd0e2d60f8
parentabb94fb35445de2eadd1804ad2f4023bd50a6b5c
parent8762420a96014f3cb0f2aecdc9cd2045d9da1b96
Reconcile with gingerbread-release honeycomb-release

Change-Id: I99f8eb6e9de9d63b4d7426ec3a75db9e843bffcb