| commit | f6167c87682c118f64f220d7f09da6c4bd766fda | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:23:05 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:23:05 2013 -0700 |
| tree | b0083c3f2d9f990adf5140041e55b7606f400e13 | |
| parent | 85695457ba745d0b22e565c80816a39c4cc0d528 [diff] | |
| parent | 84b75bf4dceffe101de42eba9186393da1fbd1bc [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Iac55adc80b6a38a8e0aadbb9b7de27c7fd7dac2c