OSDN Git Service

am f93f5bf4: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:42:48 +0000 (07:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Oct 2012 14:42:48 +0000 (07:42 -0700)
commit94e8d5e5e8bbf82035615cda85ef7cdb45fb2012
tree5da5738d700fe39bf1c87b8b1af69c34834d8f24
parentcedc58d5c4e8769ac2dac6ddb9605776cbd452d8
parentf93f5bf4a48df3b1557734a1e945b9556ce16f92
am f93f5bf4: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'f93f5bf4a48df3b1557734a1e945b9556ce16f92':