summaryrefslogtreecommitdiffstats
path: root/core/jni/android
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-11-13 23:55:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-13 23:55:38 +0000
commitc25e0dcea982468225c4150dcb699db5185a1eee (patch)
tree4b06828bc69c3844b8ca13946552963bac7de75e /core/jni/android
parentd99c25eff3ad421b900caf7af82f970b23a81733 (diff)
parent5b50cd13688e0a71991b5335d3a28189e1906a2c (diff)
downloadframeworks_base-c25e0dcea982468225c4150dcb699db5185a1eee.zip
frameworks_base-c25e0dcea982468225c4150dcb699db5185a1eee.tar.gz
frameworks_base-c25e0dcea982468225c4150dcb699db5185a1eee.tar.bz2
am 5b50cd13: Merge "Frameworks/base: Fix build"
* commit '5b50cd13688e0a71991b5335d3a28189e1906a2c': Frameworks/base: Fix build
Diffstat (limited to 'core/jni/android')
0 files changed, 0 insertions, 0 deletions