| commit | 693265ae557594c04ad51bbc20de7674835c108c | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Mon Feb 03 22:55:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 03 22:55:13 2014 +0000 |
| tree | 69f8dcadd491553c4f0b99da0837ed43611dc847 | |
| parent | eff19d36fcbdcf3d554b961905a54e4a01c61629 [diff] | |
| parent | a392cdf375e4f43bea8c5398ed2b3bc993a31a77 [diff] |
am a392cdf3: am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture." * commit 'a392cdf375e4f43bea8c5398ed2b3bc993a31a77': Remove hidden API setSurfaceTexture.