| commit | 6b0693a318f8474f545cdccfb63cc74f847b3256 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 10:17:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 10:17:23 2013 -0700 |
| tree | 876dd956689a073aa688c21d4e3c23f2d8ec1eb7 | |
| parent | 8964b3bb3d12a63815966aae1f707add935225d1 [diff] | |
| parent | 8f4e09d2a8213d64edacc081879aaadd56b961bc [diff] |
am 8f4e09d2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '8f4e09d2a8213d64edacc081879aaadd56b961bc':