OSDN Git Service

Merge commit '525f953b' into manualmerge
authorJeff Hamilton <jham@android.com>
Mon, 10 Jan 2011 03:01:56 +0000 (21:01 -0600)
committerJeff Hamilton <jham@android.com>
Mon, 10 Jan 2011 03:01:56 +0000 (21:01 -0600)
commitb7f03529cf5d28fa44ea8f89c61de8112963344d
tree74b0913b436b546531ec4be474d012b46699b6ea
parent484e47dbb9aa7d83979866861a9c7b6fa30e5651
parentf7206eab53deed2d621bff9b350db4c0a6da0dfd
Merge commit '525f953b' into manualmerge

Conflicts:
api/current.xml

Change-Id: I6cbde67b8da6b85def6e3ddd985b0e04edf279a7