diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-02-08 11:43:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-08 11:43:07 -0800 |
| commit | 6c971bfac3e95a0106dbdc9258656cb91ea033a8 (patch) | |
| tree | d2ea5c7790ed984cd9b21aec1ec2b07a65d5c0bf /graphics/java/android/renderscript/Allocation.java | |
| parent | 70a0327abd80d07432cdad61fd1713a96248abb8 (diff) | |
| parent | b555029e411498b86efad38a1948e4cfb4f43dd1 (diff) | |
am b555029e: am 2e65e20c: am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit 'b555029e411498b86efad38a1948e4cfb4f43dd1':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Diffstat (limited to 'graphics/java/android/renderscript/Allocation.java')
0 files changed, 0 insertions, 0 deletions