OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 12 Mar 2013 14:14:59 +0000 (07:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 12 Mar 2013 14:14:59 +0000 (07:14 -0700)
commitc2349abde4087ce2cb4b260d7ba7b26844365a2b
tree2c96be63ce5b0161ab65c202c1525c5dd0e78e69
parent3974ae689fafc2d19458416342e0da0915badd29
parentbce54bf16c63453b12ebafe7273c04e9382a72e0
Reconcile with jb-mr2-release - do not merge

Change-Id: Iee469c89331fc9626c24bf2c42890c8abb7f1380