| commit | e7e82d9cd97f6755fd5b6c1ab8e8f1227d3f34b8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 26 12:34:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 26 12:34:20 2013 -0700 |
| tree | ae728923065d31289aa7c0dcf567f948fa04ae08 | |
| parent | b8e741f103a9f4d180aebc1f68a7dd4c52aa2b33 [diff] | |
| parent | a92d7452a3e864689844b3c2f0902fdf0a407755 [diff] |
am a92d7452: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'a92d7452a3e864689844b3c2f0902fdf0a407755':