summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-06-23 20:45:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-23 20:45:24 +0000
commit88249c610225f7ebb1ffe7afd7f95200003ea60c (patch)
treeee04c03b656ea5fd6554bc001b87ec6cfdfcf760
parent346523acb0f1cc4ce2ea1d9e1335d24407ec25e0 (diff)
parent9ea321d115d8a620a02eb068ed539cca05d6243c (diff)
downloadandroid_frameworks_ex-88249c610225f7ebb1ffe7afd7f95200003ea60c.tar.gz
android_frameworks_ex-88249c610225f7ebb1ffe7afd7f95200003ea60c.tar.bz2
android_frameworks_ex-88249c610225f7ebb1ffe7afd7f95200003ea60c.zip
am 9ea321d1: am 2a573a6a: am 56bab444: Merge "AArch64: Fix GetChannelCount() declaration."
* commit '9ea321d115d8a620a02eb068ed539cca05d6243c':
0 files changed, 0 insertions, 0 deletions