commit | a6546e47d93d19b61b2c706b8b6f8cbd088f93ab | [log] [tgz] |
---|---|---|
author | John Reck <jreck@google.com> | Fri Jul 01 22:09:47 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 01 22:09:47 2016 +0000 |
tree | c40ab5468eaa07b79a71337903c45702e817df31 | |
parent | 4bc6f4c04ab20a33783fb7d14eec903011634456 [diff] | |
parent | acfdf0eab5323a417e09e14528c5f1e4eed227e8 [diff] |
Merge \"Merge \\"update GlSurfaceView:onPause/Resume docs\\" into nyc-mr1-dev am: ee557b2b99\" into nyc-mr1-dev-plus-aosp am: acfdf0eab5 Change-Id: I533118b55db988d8498b08806b3bb360b7a65deb