summaryrefslogtreecommitdiffstats
path: root/core/jni/android
diff options
context:
space:
mode:
authorChristoph Studer <chstuder@google.com>2014-12-04 21:46:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-04 21:46:32 +0000
commit51347595a3ea7749b2c771ac1e8f8f729a55e1a9 (patch)
tree212683c4b093b4fac753c81da32930717e889b2d /core/jni/android
parent9c403d8513db5790364e9f5fafca5c6cf896d369 (diff)
parenta6ecb61ee7a87af7153f11289d7df1eb6f1beb67 (diff)
downloadframeworks_base-51347595a3ea7749b2c771ac1e8f8f729a55e1a9.zip
frameworks_base-51347595a3ea7749b2c771ac1e8f8f729a55e1a9.tar.gz
frameworks_base-51347595a3ea7749b2c771ac1e8f8f729a55e1a9.tar.bz2
am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev
* commit 'a6ecb61ee7a87af7153f11289d7df1eb6f1beb67': RankingHelper: Remove STOPSHIP
Diffstat (limited to 'core/jni/android')
0 files changed, 0 insertions, 0 deletions