OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:11:02 +0000 (10:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:11:02 +0000 (10:11 -0800)
commitcff569f11cb4960ce5299bf6c198eeb7945dc224
treebbb1614c194ff83827c679a7bb434e0941b7a386
parent8b24b374139e608182515b56ec6f7b87a8293024
parent7ca9dcbdff2b93eadb983209a507ee0d60c7a5c5
Reconcile with ics-mr1-release

Change-Id: Ie299bdc69639bde826652cf5da7b7826161b787e