OSDN Git Service

am 5d0c713a: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 Jan 2012 23:52:27 +0000 (15:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Jan 2012 23:52:27 +0000 (15:52 -0800)
commitfbe807addeb759b2354fa4151adff52849cd9fe0
tree576307fdbeb7b1501f97f846aa4af7c2ae4af17f
parentaf0b82748ed900efab48068137114740cc84ee8f
parent90a607163f793b968d96295b876532e4d03b642c
am 5d0c713a: Reconcile with ics-mr1-release

* commit '5d0c713a87e9fd3cc7a775092aef9fc1194c7440':