summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-09-12 07:50:17 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-09-12 07:50:17 -0700
commite7889d237cbcf59d7b50aa1511e06a4de04b351e (patch)
treef81cdcdfa1e553370d144a728cded7131004dd0c
parent98515c8bee11bc79c588e4467d11c32ba472a6fe (diff)
parent0aa129b8732c96fe8608535289bdadd5f172b69b (diff)
downloadVideoEditor-e7889d237cbcf59d7b50aa1511e06a4de04b351e.tar.gz
Reconcile with jb-mr0-release - do not merge
Change-Id: Ia4a12308b845a8c8403e86132c284a876e0f0676
0 files changed, 0 insertions, 0 deletions