OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:05:16 +0000 (10:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:05:16 +0000 (10:05 -0700)
commit76519befe4d2465afe782a6cc5e812d4458bfb1b
treef0194c35c8e92907d3a4fd2e075a2f7f0858a5d4
parente0ca13a65d351877c4fafacb8031fbe1abe7a3f2
parent19a596598fc59efc7323fc008d3888c62bb9b2c6
Reconcile with jb-mr2-release - do not merge

Change-Id: Id4335690018052987409fd37e3c60454e3da283b