OSDN Git Service

resolved conflicts for merge of c0715fd5 to master
authorJeff Sharkey <jsharkey@android.com>
Thu, 1 Dec 2011 19:48:20 +0000 (11:48 -0800)
committerJeff Sharkey <jsharkey@android.com>
Thu, 1 Dec 2011 19:50:15 +0000 (11:50 -0800)
commit0f5b04f2416b359db14927a55f67e7c618346e5f
tree6a0343adfbf8d163bf2f0bae68b71f799c201c73
parentc6832775d16bcb7e7fd11b577fd9e4ce86f34d49
parent8628ec7a18af23688a9a6b185914aa4d7170e0b9
resolved conflicts for merge of c0715fd5 to master

Change-Id: Iab2221b984c2b86d0b220466f58368fbf1af5e20