commit | c5b6bd8e53e38db1afd543262490fccc1962f3e9 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 07:23:43 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 07:23:43 2013 -0700 |
tree | f2c68f73e1d2d94dc8b765392e5dba98f7d33b8a | |
parent | 3de1ebebe75042cd7dc342c4e3fa094bbb5cbc8d [diff] | |
parent | b577ee13aadb4a54909cf9ac5e86b92156a5ecb5 [diff] | |
parent | 4a86948ca6ff8811774820612408b73d5303214f [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I914272e7b65b9b792f8d71f0654ab156fdbef452