OSDN Git Service

am 133ad2a8: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Nov 2012 20:44:59 +0000 (12:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Nov 2012 20:44:59 +0000 (12:44 -0800)
* commit '133ad2a830cab9fd02d4f1be41350ac755ca0086':


Trivial merge