OSDN Git Service

merge in jb-mr2-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 21 Jan 2013 15:10:45 +0000 (07:10 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 21 Jan 2013 15:10:45 +0000 (07:10 -0800)

Trivial merge