| commit | 1b94a03284977c5c09df874ad8169439af57e3c2 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Nov 21 22:59:53 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 21 22:59:53 2013 -0800 |
| tree | e2a3430a5e19b26d84d3685106ccffd8534b2980 | |
| parent | fc806e9720a2d3e1026accb1512841ae530be59c [diff] | |
| parent | 00a8f245f5c91b1a61bf5ca3ca690c52496c8731 [diff] |
am 00a8f245: resolved conflicts for merge of 5af4cc5a to klp-dev-plus-aosp * commit '00a8f245f5c91b1a61bf5ca3ca690c52496c8731': Fix getGenericSuperclass.