OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:44:59 +0000 (07:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:44:59 +0000 (07:44 -0700)
Change-Id: I55884a9acd85fee2a3b45f5262b074731ca9ea16


Trivial merge