commit | ec374741d3601ce66d8bac883fec79ecf570f9c4 | [log] [tgz] |
---|---|---|
author | Rob Carr <racarr@google.com> | Wed Jun 29 03:40:19 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 29 03:40:19 2016 +0000 |
tree | b594d9a761ca0dc5fd74c07e68d489cd61174200 | |
parent | 57b4545f98631ff5c5f515ff0f554c1b351e7e77 [diff] | |
parent | 5bf74ae1b9102ad2030ffaad4f27f4f0cf783a62 [diff] |
Merge \\"Only use one SurfaceControlWithBackground per AppToken.\\" into nyc-dev am: 55427a6650 am: 5bf74ae1b9 Change-Id: I5f09aa883e01593ddf0fad9b5f14201619e652a5