OSDN Git Service

Merge "resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp" into honeycom...
authorJeff Hamilton <jham@android.com>
Fri, 14 Jan 2011 06:58:08 +0000 (22:58 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 14 Jan 2011 06:58:08 +0000 (22:58 -0800)
commit96aa8e9865ee973ba0e571935278b3fd21ea9dbd
tree2946bfb7cba242d456f0aa4bfb181dc067685131
parentfe9fe94ec7858737aba961d8cde1049649e03bb3
parent5573e5583bf4963f2196d6ec36380a20d67df113
Merge "resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp" into honeycomb-plus-aosp