summaryrefslogtreecommitdiffstats
path: root/camera/MODULE_LICENSE_APACHE2
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@google.com>2015-12-15 12:54:55 -0800
committerThe Android Automerger <android-build@google.com>2015-12-15 12:54:55 -0800
commit149c0cb8048c9a21fa3e04b8071e544b0c3824c6 (patch)
tree07423dde85b3439ea496f4c16cb377feef8d72af /camera/MODULE_LICENSE_APACHE2
parent5dc9ffe50ef517591b8ffad66c7e4d6ec82b8b4b (diff)
parent7b461b52966265b7b55f723c22fa02fac32a8709 (diff)
downloadframeworks_av-149c0cb8048c9a21fa3e04b8071e544b0c3824c6.zip
frameworks_av-149c0cb8048c9a21fa3e04b8071e544b0c3824c6.tar.gz
frameworks_av-149c0cb8048c9a21fa3e04b8071e544b0c3824c6.tar.bz2
merge in mnc-mr1-release history after reset to mnc-dr-dev
Diffstat (limited to 'camera/MODULE_LICENSE_APACHE2')
0 files changed, 0 insertions, 0 deletions