OSDN Git Service

am d82fa081: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:26:23 +0000 (08:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 May 2013 15:26:23 +0000 (08:26 -0700)
commit0c4d6ca03c4599636eab1466544a9266272687ad
tree3ecb72ce12739a98390a7793f5160bfaa3062b3b
parent7e8455bc09446ab2bfea4226eb28a955ae38cb45
parentd82fa081f96985ceef99f523a83e2bb365b949b1
am d82fa081: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'd82fa081f96985ceef99f523a83e2bb365b949b1':