OSDN Git Service

resolved conflicts for merge of df61573b to master
authorMike Lockwood <lockwood@android.com>
Mon, 5 Apr 2010 19:55:40 +0000 (15:55 -0400)
committerMike Lockwood <lockwood@android.com>
Mon, 5 Apr 2010 19:55:40 +0000 (15:55 -0400)
commitde3ebff26fb0bcf89edccb74251cd57cca583694
tree0eb7849b84e32aa61d5f02bbbd5182ec43732ecf
parent30219ff6bee36db7e30256de7bd74ca5a4498549
parentdf61573ba8030e2ab37b3fcaa0cec15b5922b80c
resolved conflicts for merge of df61573b to master

Change-Id: I483a850ac59c4cc90d5d48edd7164ea29673cb6d