commit | 330766432646e071ec3c03a6019145be9efe9005 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 11:49:43 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 11:49:43 2013 -0700 |
tree | e367431b65f9e6c05696e04c964728fd6879aefe | |
parent | 3a4fdca66f8985152e695f702f925af41e5f8aed [diff] | |
parent | d8d0c17e22f42597497e8f9f5c134621e399e22a [diff] |
am d8d0c17e: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit 'd8d0c17e22f42597497e8f9f5c134621e399e22a': "JSS11" "JWR66V"