| commit | a592b761845595be8be6379fa6e72613649e0900 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 16 11:20:54 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 16 11:20:54 2013 -0700 |
| tree | 73f8f49f9cce80db33cd64b65d1dd70a6e1cfc20 | |
| parent | bc3fe33c244e74ff0a29b86769973de8dec20db7 [diff] | |
| parent | eed1a599f03dd5da3cd449ce21c7767770ebb29d [diff] |
am eed1a599: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'eed1a599f03dd5da3cd449ce21c7767770ebb29d': JSS15B