OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:48:05 +0000 (07:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:48:06 +0000 (07:48 -0700)
Change-Id: If88cdd28e163c84b5d6e64eb82b1c322d665a382


Trivial merge