diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:17:29 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:17:29 -0800 |
| commit | 99a2df71960f4323500b3f1f56e95c53146594c1 (patch) | |
| tree | a0779929f5bf9cb795ef05a4972985565d41e50c /tests/cppbasic/compute.cpp | |
| parent | f598811a60088236222bb1879503842094ca378b (diff) | |
| parent | 8832b5042f8d33a62dc7a07dc330ec65f1eec55a (diff) | |
| parent | f5cf4a541655eccb902925f38607dbcb0687ca13 (diff) | |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Id732ebdaefa983dc38d2a27a0f04317888b3a3f9