aboutsummaryrefslogtreecommitdiff
path: root/assets/descriptor.json
diff options
context:
space:
mode:
authorhwc4872012-05-08 12:05:10 -0700
committerhwc4872012-05-08 12:05:10 -0700
commit711c94331ab04bba1d756a30835d376143177820 (patch)
tree9a7e60d8cc8365220c0969a4f3d373ae146c8ac2 /assets/descriptor.json
parent9eeb03e8bb86a4462609d3a18b528daa1516b91c (diff)
parent53747ce689ddcdc19e586b30d6f356b3b0539731 (diff)
downloadninja-711c94331ab04bba1d756a30835d376143177820.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping
Diffstat (limited to 'assets/descriptor.json')
0 files changed, 0 insertions, 0 deletions