OSDN Git Service

am 3e78f477: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 19:49:03 +0000 (12:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Sep 2012 19:49:03 +0000 (12:49 -0700)
* commit '3e78f477c237e3ac9da58b698893b482c4baefa4':


Trivial merge