OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Fri, 5 Aug 2011 17:28:05 +0000 (10:28 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Fri, 5 Aug 2011 17:28:05 +0000 (10:28 -0700)
commit2cbd8392875afa8c25ddef636dbf27b73313d402
treecfdadcaeadce2b48701d0814de15a01962629484
parent7b0737698ae7eaca8283d05b24f97906adcbe927
parent591d6494c335b131bdbdac53418bd31a3f4a8cc4
merge from open-source master

Change-Id: Id6e8a934082731aa709a4c22b0815b19e9d1e4ae