summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJustin Ho <justinho@google.com>2012-06-01 19:02:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-01 19:02:11 -0700
commit7cca871de1f9ed649d671f327e4bb3d30ba11cca (patch)
tree147039907e14fafc963e75a7042ccb7989462279 /core
parent90c31f8b769b3e2f24441754c403cc07ca9e936d (diff)
parent5caa24fd3eb12edbc75f35dba831166b8ebe603f (diff)
downloadframeworks_base-7cca871de1f9ed649d671f327e4bb3d30ba11cca.zip
frameworks_base-7cca871de1f9ed649d671f327e4bb3d30ba11cca.tar.gz
frameworks_base-7cca871de1f9ed649d671f327e4bb3d30ba11cca.tar.bz2
am 5caa24fd: Merge "Temporarily disable FakeOemFeatures from userdebug or higher builds" into jb-dev
* commit '5caa24fd3eb12edbc75f35dba831166b8ebe603f': Temporarily disable FakeOemFeatures from userdebug or higher builds
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions