OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Jan 2011 03:36:29 +0000 (19:36 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Jan 2011 03:36:29 +0000 (19:36 -0800)
commit2350f4f171ab536cf31545a25d5ba7025ad73693
tree8fb367ed443c81a2a00fbfe7d06640709400b537
parentd972ce1a6fdf47dc304b89f90d231b26241219a9
parent3995eee9d31a0e01454e2c3f9582525e88186022
merge from open-source master

Change-Id: Ifc8965806394560e4dd8da14c1789140998ea51f