OSDN Git Service

am fca2ad6d: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Sep 2012 07:32:54 +0000 (00:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Sep 2012 07:32:54 +0000 (00:32 -0700)
commit70b4532d520cf338f70d87715b5f3b26f582f538
tree8c0f00993d3771ac31b7f4644ada0d4e3318f80d
parenta0e0c039bf776c5cbbaf384e462343e279c777a4
parentfca2ad6dfa28253e859ff9cfe4c2c80229d71a89
am fca2ad6d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'fca2ad6dfa28253e859ff9cfe4c2c80229d71a89':