OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 5 Dec 2011 16:53:06 +0000 (08:53 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 5 Dec 2011 16:53:06 +0000 (08:53 -0800)
commit2158db000d227875b12c85c850ec6e3039553f9b
tree27c6aed77ee974054e91426386a8daa23ca4bab6
parent0cb4b9a6aa1f1f28b7b5d3e02b1d7fac70817b0a
parent36126b2f17223803c981e4ff7bca2d751d971753
Reconcile with ics-mr1-release

Change-Id: I35fea7fba390129cec15616718e2880bfa3b414c