OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 May 2013 14:23:04 +0000 (07:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 May 2013 14:23:04 +0000 (07:23 -0700)
commitcac5951436f3cff8b0e634b52633b193e139c135
tree0b69e7bb5b1d80c6b4c9fce7b03ff0eb5ed9a946
parent28d3467e5dbad9e21e7a7695a15faedea5e9c8ef
parent144ad0582fc7a5b743ac64738b5d64d2fa9e39ef
Reconcile with jb-mr2-release - do not merge

Change-Id: I7100dae7ada8486be79bec2166bf9b8f81cf9e34