OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:44:29 +0000 (09:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:44:29 +0000 (09:44 -0700)
commit6c8395633d4ed9f88888e6df0ae2f33fd8401fd0
tree4f10f3af7541bc957551e421664b2363a3fec070
parent4c7b312964b2430ccc1f99e99092cc870be2a293
parent4eca45e8ce73dad528be3ed7032626789035f5bd
parented79d162614413cf42521cab798d4be8c4339c53
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I0a56a7cd77b8d52e699455b6bd01b884bcc32bc4