| commit | ef8b12fd2aff653e40a5d16cec1ffbbb2d569104 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jun 29 03:40:46 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 29 03:40:47 2016 +0000 |
| tree | b594d9a761ca0dc5fd74c07e68d489cd61174200 | |
| parent | e9d27e58b9f188a5cd3a83b8a12aea80d96b09f7 [diff] | |
| parent | ec374741d3601ce66d8bac883fec79ecf570f9c4 [diff] |
Merge "Merge \\"Only use one SurfaceControlWithBackground per AppToken.\\" into nyc-dev am: 55427a6650 am: 5bf74ae1b9" into nyc-mr1-dev-plus-aosp