OSDN Git Service

resolved conflicts for merge of 8928ef8b to master
authorJean-Baptiste Queru <jbq@google.com>
Fri, 22 Oct 2010 19:29:10 +0000 (12:29 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 22 Oct 2010 19:29:27 +0000 (12:29 -0700)
commit09fa73b3c334da4c061fc346dc65714f8738e5f1
tree9858c60919e21291ee9a0d935ff44c86393cb527
parent6c75cb3752d51adfd3c7b72672f5abacdc4cf2bd
parent8928ef8b4cc46bf9c5be3466ad8cb4ab40bb8a2c
resolved conflicts for merge of 8928ef8b to master

Change-Id: I0c2fa435b38266f71651756570926c4b1488b57e
target/product/full_no_telephony.mk