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)
Change-Id: Iab2221b984c2b86d0b220466f58368fbf1af5e20


Trivial merge