OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 29 Nov 2012 17:13:38 +0000 (09:13 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 29 Nov 2012 17:13:38 +0000 (09:13 -0800)
commit6d93da465ab8fff02728f268785e59ab86a2a0c2
tree92cae0d04c72a79467a66e62bfdf542a18df2c30
parent31e8485028e93c16312c57b5bb6b511e3bc8582d
parentd98ae61dfb3525e01420dd99f9c448163e68d0c0
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I83096147b7adbf5396fdb88114abce568b4ec0cc