OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 Dec 2012 16:36:52 +0000 (08:36 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 Dec 2012 16:36:52 +0000 (08:36 -0800)
Change-Id: I8c005f84138fa3c89e006790fcf107e521dfa20e


Trivial merge