diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-02-08 11:21:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-08 11:21:03 -0800 |
| commit | b555029e411498b86efad38a1948e4cfb4f43dd1 (patch) | |
| tree | 1221e797c27cb40d876cb5c67707f1bcd1f0f704 /graphics/java/android/renderscript/Allocation.java | |
| parent | 85a1ee30215190b1782127a6afe323f4df4ef131 (diff) | |
| parent | 2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff (diff) | |
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 (3) and others
* commit '2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff':
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