OSDN Git Service

resolve merge conflicts of cdbdd46 to master
authorJohn Reck <jreck@google.com>
Fri, 12 Aug 2016 15:24:33 +0000 (08:24 -0700)
committerJohn Reck <jreck@google.com>
Fri, 12 Aug 2016 15:24:33 +0000 (08:24 -0700)
commite886ad2c951cb266fd3e558a0138cae92528443a
treeeaff6cab0122ff2822be7526c53b755cadbbdc3a
parentcfd87531e7b41a347e75b66b9d61376c4ee1033d
parentcdbdd46fb3b76e849fcb892a8f6565a79528e8c1
resolve merge conflicts of cdbdd46 to master

Change-Id: I18a60477799865973fc9d6c876d95e3cee6e5031
core/java/android/view/TextureView.java