OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Nov 2012 20:41:25 +0000 (12:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Nov 2012 20:41:25 +0000 (12:41 -0800)
commitacbdb76a6bf9953e8e80bd59a41f456c27ddfa25
treeb317527b1486b53fc2c52de10e266370ae35aae5
parentadbfc77c4ba01cc4a0811066e09cd6adee3b9252
parent8784bf6fe0c34d5874db200f1dc61ab8611452e4
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I2bf1cf80a9166d9d8d574f811a6ea60f498b0f05