OSDN Git Service

am 7e4aa24c: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Dec 2011 15:21:45 +0000 (07:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 21 Dec 2011 15:21:45 +0000 (07:21 -0800)
commit0f04cd6044f9db90cca4111acdf2eba4388e3a07
treeb2ba4545d3d06a8ccde00a2f5051189f4b3449ae
parent22a4c1c0069d49a21b918668b6fb74dc739c50ec
parentdebdcaec3db9902e310c94f6d8709e6ebb843b89
am 7e4aa24c: Reconcile with ics-mr1-release

* commit '7e4aa24c8701381f542a324df958907194285fdc':