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)
commite3db3d6209c234e032775079a1e1489478dabf86
treee27a86953b6cf2df65d5553fd5e13fc8ac4d6c5f
parentf7c60a05bf610ad9cb6914a296dfebb72f1ad2c5
parent525f953bb119fac27a877b0e56e4bc7777df70f5
Merge commit '525f953b' into manualmerge

Conflicts:
api/current.xml

Change-Id: I6cbde67b8da6b85def6e3ddd985b0e04edf279a7
api/current.xml