summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2014-11-24 18:05:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-24 18:05:40 +0000
commitbd9567e1569a6fc5222427f18cc653c29c0beb89 (patch)
treef4bdf7b7af4ee602301372b2e8d6fc57b59b0ea3 /telephony
parente36131bee6e52be03227f1103e4ce23528e243da (diff)
parente289082a7066a86032190aa100425ce29cd2a4f2 (diff)
downloadframeworks_base-bd9567e1569a6fc5222427f18cc653c29c0beb89.zip
frameworks_base-bd9567e1569a6fc5222427f18cc653c29c0beb89.tar.gz
frameworks_base-bd9567e1569a6fc5222427f18cc653c29c0beb89.tar.bz2
am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev
* commit 'e289082a7066a86032190aa100425ce29cd2a4f2': Camera: Add new capability flags as system features as well
Diffstat (limited to 'telephony')
0 files changed, 0 insertions, 0 deletions