OSDN Git Service

Mass merge from gingerbread - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 30 Jan 2011 20:41:10 +0000 (12:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 30 Jan 2011 20:41:10 +0000 (12:41 -0800)
commit57527df77908faf7bd341cfcdb7af92700526067
treef213f138d7eb421c340a3bec20e4f28fa4e0738e
parent9613628e48cb303a4c715918d70cc3aa45408e27
parente7b695648951f167cb880d99dd83fa2bb96afca8
Mass merge from gingerbread - do not merge

Change-Id: Iaa45284ab43b861aa704076779b43434fa70b378