OSDN Git Service

resolved conflicts for merge of f8cc65c4 to honeycomb-plus-aosp
authorRobert Ly <robertly@google.com>
Wed, 2 Feb 2011 22:04:20 +0000 (14:04 -0800)
committerRobert Ly <robertly@google.com>
Wed, 2 Feb 2011 22:04:20 +0000 (14:04 -0800)
commitc0b3ba83b2ccb270024810dc6a4434458b10de28
tree046f74d4c724077a70899102a6c7b3e399eecb8c
parentc2c2360bf1c7e005225383ec9fb5c39c0ef88a74
parentf8cc65c4ca1851ad279cd961b30e1bc4d48e43e4
resolved conflicts for merge of f8cc65c4 to honeycomb-plus-aosp

Change-Id: I407df4448a126a39128f3e24232c166be2625e14