OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:57:54 +0000 (05:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:57:54 +0000 (05:57 -0700)
Change-Id: Idf9e1ad5fe56ee4d56e5266630b6f971ecba10c7


Trivial merge