OSDN Git Service

am f6167c87: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Jul 2013 18:49:44 +0000 (11:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jul 2013 18:49:44 +0000 (11:49 -0700)
* commit 'f6167c87682c118f64f220d7f09da6c4bd766fda':


Trivial merge