OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Fri, 26 Aug 2011 19:07:40 +0000 (12:07 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Fri, 26 Aug 2011 19:07:40 +0000 (12:07 -0700)
commita0c628e83eb5ed5a54a1108d7af1d2fe60632e22
treebed854bcd23425a1214da4dffef9f712ff0aa41a
parent9fd54dcd920c2c1e210de26cc1678e9f6bee6407
parentf16cf36480cf2f043c9ce1df13c00a693886b8d3
merge from open-source master

Change-Id: Ibc17c1b227a6af2ce933040260d9b4a858eeca1d