OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Nov 2012 15:19:26 +0000 (07:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Nov 2012 15:19:27 +0000 (07:19 -0800)
commit18f95189727de29246b663ad4557075678217555
treebcd8c9d74216120fe142bd89848b87156abf4852
parentc1ae43ade0baa4dc8af1b505ba4b83f0f72c6dd8
parent913f13ef69520bf64bde61006be0b85db8502508
Reconcile with jb-mr1-release - do not merge

Change-Id: I807fafdf3e52abcd291f3f8e593c92f8016ad2ef