OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:43:34 +0000 (07:43 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:43:34 +0000 (07:43 -0800)
Change-Id: I499b518412a7bd7fda77560aed8f66a798013cd1


Trivial merge