| commit | ef50a1a0dd9a962d1b92613399ed34058ee2098c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:52:24 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 08 15:52:24 2013 -0700 |
| tree | a4b74b7db468aa2df778d50eea94e2620e9ecd57 | |
| parent | d19db9a7c4427765dddd3210963c4277eee412f2 [diff] | |
| parent | 7c2ea974834b2aa3f416aff4962fdd7bbec8a51f [diff] |
am 7c2ea974: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '7c2ea974834b2aa3f416aff4962fdd7bbec8a51f':