summaryrefslogtreecommitdiffstats
path: root/graphics/java/android/renderscript/Int2.java
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-01-04 18:35:40 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-04 18:35:40 -0800
commitea3c57176b5882b0484d9b8aff67e178118c8b91 (patch)
treec207212de5635cb4684f9148cb7e29a0dd35a943 /graphics/java/android/renderscript/Int2.java
parent7f08071f3dc78f9178589c4d2fe6233516060f17 (diff)
parent978e41fccf278bb64c5204d80d8de95c9bf2e3d5 (diff)
downloadframeworks_base-ea3c57176b5882b0484d9b8aff67e178118c8b91.zip
frameworks_base-ea3c57176b5882b0484d9b8aff67e178118c8b91.tar.gz
frameworks_base-ea3c57176b5882b0484d9b8aff67e178118c8b91.tar.bz2
am 978e41fc: am 8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
* commit '978e41fccf278bb64c5204d80d8de95c9bf2e3d5': Fix technology extra naming for IsoDep and NfcB (API part).
Diffstat (limited to 'graphics/java/android/renderscript/Int2.java')
0 files changed, 0 insertions, 0 deletions