OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:45:43 +0000 (10:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:45:43 +0000 (10:45 -0700)
commit1a34a19fb668dc40cd7573393e8777c78434e6e5
tree0823ca5bb8b90967c8470ac079879d7e7a5da934
parentf416da980218b0c61bed1bcaa0048a5e8f7285a1
parent920ac0436a86d5bda1cbf7f739d0dc3d2b71944e
Reconcile with jb-mr2-release - do not merge

Change-Id: I49eb0fa91c0c510075419629195dcb27b9359e7d