OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Dec 2012 15:34:02 +0000 (07:34 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Dec 2012 15:34:03 +0000 (07:34 -0800)
commite08791c8318216b7934742681edfab57b8147d78
tree04cd0a5d938812970516d3ae5227580961dfead0
parentdc4beb483eb14f1b56154125c67b780802756572
parentd33ef85086c353a82bc69381393b69f0a8ef4bfa
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I3041300565b33629c8d2609a75d384b731f292ce