OSDN Git Service

Reconcile with nakasi-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 29 May 2012 16:41:02 +0000 (09:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 29 May 2012 16:41:02 +0000 (09:41 -0700)
commit65838c52fa47cd4b7adf2ca0c27ed26376acc6c5
tree60dcd0cccccf0739e3ba0359066bf9e6256bb18d
parent227d45ea2b9ccade09fd620d028e992ff1140b99
parent9f63d6fece8beac1d8abc802f013995e708e2803
Reconcile with nakasi-factoryrom-release

Change-Id: Ib47a2f4001bbf5ec4a2b889a16e41a1259eb6e1a