OSDN Git Service

am 7e18ed8c: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 May 2013 16:02:36 +0000 (09:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 May 2013 16:02:36 +0000 (09:02 -0700)
commit73493ae2568fae4d5cb454df18bb90faa4fd3a84
tree3237451c29146e07e07557dc913a82efd9302f0d
parent6dcdfab90627b211e4ba0877c506468030ad806b
parent7e18ed8c14ca2047a5f82f2eb8bcab93d673d730
am 7e18ed8c: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '7e18ed8c14ca2047a5f82f2eb8bcab93d673d730':