| commit | 57bc0f5429fb0c8297054d6fcd9df4f6370d39e3 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Tue Nov 04 23:59:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 23:59:29 2014 +0000 |
| tree | cc9500b783e8f51a384f4537deaed1543ba7fa21 | |
| parent | 2490b5b282fadd6ff9381cb8baf42911f49aeec3 [diff] | |
| parent | cc19cb6845f427036513e155d50c11533933c63f [diff] |
am cc19cb68: Merge "Don\'t define DISALLOW_COPY_AND_ASSIGN if already defined." * commit 'cc19cb6845f427036513e155d50c11533933c63f': Don't define DISALLOW_COPY_AND_ASSIGN if already defined.