| commit | 6e7571074aded0f7716b02d6a7d141871f7f0145 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Wed Nov 05 00:08:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 00:08:56 2014 +0000 |
| tree | 86f5701b19aba55c44a38ec0f6388aca81c8b610 | |
| parent | 83e9505094f94119e8dba15258f26b84242feec8 [diff] | |
| parent | 57bc0f5429fb0c8297054d6fcd9df4f6370d39e3 [diff] |
am 57bc0f54: am cc19cb68: Merge "Don\'t define DISALLOW_COPY_AND_ASSIGN if already defined." * commit '57bc0f5429fb0c8297054d6fcd9df4f6370d39e3': Don't define DISALLOW_COPY_AND_ASSIGN if already defined.