OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Apr 2013 15:39:42 +0000 (08:39 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Apr 2013 15:39:42 +0000 (08:39 -0700)
commit04f495b436521cf1182c4e9c4cb496d9ab9dddf3
treebba8b673be5b2dd2be289f4021f01c3567ea8a7a
parent11cc9b07dec9f1ec7a74fe3cfcd71f7824bf3824
parent78ebdb534d2631dbb74ac06688ec6829a3020646
Reconcile with jb-mr2-release - do not merge

Change-Id: Ia460e8a06b1d068077f52c35c045ad7325e78470