OSDN Git Service

Merge "DO NOT MERGE"
authorAlex Sakhartchouk <alexst@google.com>
Thu, 17 Nov 2011 18:12:13 +0000 (10:12 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Nov 2011 18:12:13 +0000 (10:12 -0800)
commita4c667d6ebf548815e61d8ddce192bb606695984
tree7583e6574f901a66a4abee06255f89d2ed67da8d
parenta93f5406b079ff05b4d7fb16c372d51a0945b345
parent71d2a8746614460918d0d5e5a6e571c90b3c80fa
Merge "DO NOT MERGE"