commit | f2d9e68c238d754d00fa846b4d4c6737a24595fc | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 15 09:33:36 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 15 09:33:36 2013 -0700 |
tree | 2be7b85e24e8de6d7443cb0d72c72aa33dd8ab83 | |
parent | eeb90735dd7accfa34d77bcc8023412dab84bf9d [diff] | |
parent | d9575910e72dda3cacfb171a447c9bfea81d3c0c [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Id0cd5164aa3d404463c520c3361cce521f3577fe