summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Hibdon <mhibdon@google.com>2015-03-27 01:23:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-27 01:23:46 +0000
commit76a19722646bbfe29bcab2a1062848799b35c9c8 (patch)
tree3c0c55403f74bd87955e1570faf33a4b52a91ff4
parentfb7b0f3d27c53096708cea23aa4dc7e829ef36d7 (diff)
parent67b7360bf52280efa4652420656b2ceddcd7c1bd (diff)
downloadframeworks_av-76a19722646bbfe29bcab2a1062848799b35c9c8.zip
frameworks_av-76a19722646bbfe29bcab2a1062848799b35c9c8.tar.gz
frameworks_av-76a19722646bbfe29bcab2a1062848799b35c9c8.tar.bz2
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-mr1-ub-dev
0 files changed, 0 insertions, 0 deletions