OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Wed, 3 Aug 2011 19:36:33 +0000 (12:36 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Wed, 3 Aug 2011 19:36:33 +0000 (12:36 -0700)
commite107f7e88cfa3e980da1324f0087b379306359c4
tree041fc006384310b88c08dc3dc47148455d6c3d6f
parent6b27308b69def49ef392367975d12af6fad7907a
parente6836b9ded9013725500aa2c9cd113545628a693
merge from open-source master

Change-Id: Ic7c118d50e67a9c5d7ddd26634d0c835bdf6f60e