OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:19:27 +0000 (12:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:19:27 +0000 (12:19 -0800)
Change-Id: I8de173f6b24b2f82b20e568e577878d8539e5148


Trivial merge