OSDN Git Service

am 3a49cd8b: (-s ours) am bdcf8251: Reconcile with jb-mr1-factory-release jb-mr1...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:27:28 +0000 (12:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 20:27:28 +0000 (12:27 -0800)
* commit '3a49cd8b15a854ef18aae96a8f32dcd403aa81a8':


Trivial merge