| commit | 6d6ce03a03583b0e8effc1d825057578af382d0b | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Fri May 16 10:37:39 2014 -0700 |
| committer | John Reck <jreck@google.com> | Fri May 16 10:38:14 2014 -0700 |
| tree | 27083e7b548af51f2bf726659e748277ef07ec09 | |
| parent | 8974f2490992b2921b636c0b65ebeb5b19dda89b [diff] | |
| parent | 313c5f38e850b77713e11088326f0c98c3880a59 [diff] |
resolved conflicts for merge of 313c5f38 to master Conflicts: core/java/android/view/HardwareRenderer.java Change-Id: Ic5e4d578932fdcfe52d5f541bf1e1a93f33c32cd