OSDN Git Service

resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp
authorJeff Hamilton <jham@android.com>
Fri, 14 Jan 2011 06:38:31 +0000 (00:38 -0600)
committerJeff Hamilton <jham@android.com>
Fri, 14 Jan 2011 06:38:31 +0000 (00:38 -0600)
commit5573e5583bf4963f2196d6ec36380a20d67df113
tree2946bfb7cba242d456f0aa4bfb181dc067685131
parent802c5d0713ca8d70ce299de45dce45059a7b9576
parent0938c360c0fc1e7e6a9099aa6386e01b9b5946de
resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp

Change-Id: Ia7071ca07d917bd79e7697f4b0c0640ebb5f6a6f