OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 May 2013 19:54:50 +0000 (12:54 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 May 2013 19:54:50 +0000 (12:54 -0700)
commit958c30d422801c25b0b67534a5e2083941bad9a8
tree701ebb75a373c07da04c814aa3f1c190ca40cfe8
parentcea06adce077d32c0c6dc2abb68cbae8bd1a82a7
parent2dc6fbf2ac8ff13d703ea5cab27c2ba23ac0d51c
Reconcile with jb-mr2-release - do not merge

Change-Id: Id11469f5fc48fc2af186000e2eb8ade5fb5264ab