OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:05:13 +0000 (10:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:05:13 +0000 (10:05 -0700)
Change-Id: Id8df255f1ee96ac589ce42c921ff5098c9507331


Trivial merge