OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Dec 2011 13:11:43 +0000 (05:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Dec 2011 13:11:43 +0000 (05:11 -0800)
commitdf4856c3e34231ba0998814cd1c4d9e33dd929b6
tree9923d2dba8b8bf93adb3e4a54aa8788031f6c75b
parent956a9787cfaf429f951549df6e587c6ce4ac20f8
parent5061489994828273312d445e7b52aa5a337e4ea0
Reconcile with ics-mr1-release

Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8