OSDN Git Service

am 1509a46a: (-s ours) am 20152ac7: am d8e8e662: Reconcile with jb-mr1-factory-releas...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:29:10 +0000 (12:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 20:29:10 +0000 (12:29 -0800)
* commit '1509a46a860060f7630c5c58d7d08695f7350dc2':


Trivial merge