commit | b6ac0c3edb50a7ed73547ed21dcdd300f768fbea | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:37:10 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:37:10 2013 -0700 |
tree | f6729772d7a59851b0c90e68676337765dbd1abd | |
parent | 921c30b91a4afd3b9d22a957c022716f5fe8bf2c [diff] | |
parent | 8de153db1fdd3c8ae9b85ada6124d45bfc096055 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I8dbb751759f10ec2d0dc69bd2e12104df939da83