OSDN Git Service

Merge "resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp" into jb-dev...
authorJean-Baptiste Queru <jbq@google.com>
Tue, 12 Jun 2012 22:30:36 +0000 (15:30 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 Jun 2012 22:30:36 +0000 (15:30 -0700)
commita65891347556b4d14f6dad829017513b984d20c1
tree360059b5f367b7b870e466f1f6b758723963bae0
parent45e869874aaf90091be2f2fac5fcf9c73c36baee
parent89d702ac6864e0111ea2f16a524c71804bae5a5c
Merge "resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp" into jb-dev-plus-aosp