OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 29 May 2013 15:06:16 +0000 (08:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 29 May 2013 15:06:16 +0000 (08:06 -0700)
commited7bc2fa007ced0587672428b788dc4bb9c2451f
tree9b7ededd54a8188901aff7ad2c962d35bdbec22c
parent5fd8a3118784942fde17f6e5958dcfbfd21dcaaf
parent001352526317e7467e8af97f5e265b72520129a6
Reconcile with jb-mr2-release - do not merge

Change-Id: I9c8cb7d1325cc9edf656205ce7f5728cc76040ab