OSDN Git Service

am 23f4673d: (-s ours) am 711d2c79: Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:14:06 +0000 (10:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Apr 2013 17:14:06 +0000 (10:14 -0700)
commit9112523bcf93593181bd32e7fd7f22177b2441ee
tree6735b88ad487a353d77efaf43b647cb83123a439
parent3183d788bd254df93df3209842558021db5859b8
parent23f4673d3de46215cf748a20a8b28adf83003a35
am 23f4673d: (-s ours) am 711d2c79: Reconcile with jb-mr2-release - do not merge

* commit '23f4673d3de46215cf748a20a8b28adf83003a35':