| commit | 4ca342cdba6fb2637415cfeb6e579cc662763daf | [log] [tgz] |
|---|---|---|
| author | Justin Koh <justinkoh@google.com> | Thu Nov 06 20:40:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 06 20:40:56 2014 +0000 |
| tree | c9a94e79128b902501e3462ab049e02888d49aa4 | |
| parent | 768344f73da843f9cb2cf5dd5261412fde97c938 [diff] | |
| parent | 2d42f484494e4183c42114ce5918fc4592a33fb6 [diff] |
am 2d42f484: am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev * commit '2d42f484494e4183c42114ce5918fc4592a33fb6': Hide Surface#lockHardwareCanvas DO NOT MERGE