OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:40:07 +0000 (07:40 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:40:07 +0000 (07:40 -0700)
commit62d93e7675b62f5302858904bf3e72f37b8985dc
tree6300878511ac15d581a92b6b7a92f6ca3bfaed2a
parentedd2f27388d1ecf2465a07a89a4735e1ce50ea70
parent800482037b0852be62c23c848aa08f78780d27ae
parentc71b1930fdd81e519ab5aa9ad5064d75045f869c
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I79f06be720b91834009bc78383223aa98a0c1de5