OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 22:19:02 +0000 (14:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 22:19:02 +0000 (14:19 -0800)
Change-Id: I3613cb7a8d96bd334e213ca318b5e121cbefbd48


Trivial merge