OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 26 Mar 2012 17:18:02 +0000 (10:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 26 Mar 2012 17:18:02 +0000 (10:18 -0700)
commit6aa8411f2f1258cecd4c1fb593195568d08fef18
tree51046165ed70f824a59244016a7347dc50ad14a5
parent8544aac859400ee7c0109f996930b22455028dbe
parent0db00f2ebf23cb58abcbeed6b577a32d100169fc
Reconcile with ics-mr1-release

Change-Id: I9d8982c6fae0eb770c95f3b480bc6be0976c11b2