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)
commitf4579c85a6da20767170e31ef89f22c5f1932ef4
treeb2eb8aeb04d9b5270e3c8dbedd4e65718e487b3a
parent3a106dceb0f34751fa8b78de192ed75b2f6e2795
parentc0715fd58c287347458756e34f07cee1fd72b982
resolved conflicts for merge of c0715fd5 to master

Change-Id: Iab2221b984c2b86d0b220466f58368fbf1af5e20