OSDN Git Service

Reconcile with ics-mr0-release ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:21:43 +0000 (10:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:21:43 +0000 (10:21 -0800)
commit68c79e2bd8fce31fd826c2dd93ed639984c71cb2
tree488facb65d3b9369ef06ca34c3dabcd3406da238
parentd276313bf895a6810404123c0affb4b7a6a07582
parent089e65452bfe40a9f34f36be377795d175bde10b
Reconcile with ics-mr0-release ics-mr1-release

Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c