| commit | 3699c60323aca45eb0e385d6b4a27bd5861fadf2 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Sat Jul 18 00:51:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 18 00:51:34 2015 +0000 |
| tree | 34c11cb48b8a9d1f29a7ad3ac5e2f83ca4ef4361 | |
| parent | 37a69731cbcbc6a37e464cc7c022eece3a3bab8e [diff] | |
| parent | 62a2696cd2b7387ce20ec9cb9805563f313da86a [diff] |
am 62a2696c: am fbd2d949: am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev * commit '62a2696cd2b7387ce20ec9cb9805563f313da86a': Fix AssetAtlas usage in BitmapShaders