diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-10-31 09:17:10 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2012-10-31 09:17:10 -0700 |
| commit | 9ed2d0b205f38168e2c4ee7410ad1ca3528cb15f (patch) | |
| tree | a0779929f5bf9cb795ef05a4972985565d41e50c /tests/cppbasic/compute.cpp | |
| parent | fbef1f75cff74663fa40efc9e72282d37ba406e7 (diff) | |
| parent | 8832b5042f8d33a62dc7a07dc330ec65f1eec55a (diff) | |
| parent | f5cf4a541655eccb902925f38607dbcb0687ca13 (diff) | |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I4dd275dc4f27f8f216d7ba29748466c407650b6c