OSDN Git Service

am eed1a599: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 16 Jul 2013 18:20:54 +0000 (11:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Jul 2013 18:20:54 +0000 (11:20 -0700)
commita592b761845595be8be6379fa6e72613649e0900
tree73f8f49f9cce80db33cd64b65d1dd70a6e1cfc20
parentbc3fe33c244e74ff0a29b86769973de8dec20db7
parenteed1a599f03dd5da3cd449ce21c7767770ebb29d
am eed1a599: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'eed1a599f03dd5da3cd449ce21c7767770ebb29d':
  JSS15B