tree 31b6a1e50a98d17397281df0467edfc164dc0be1
parent 9633629b7916b5694ae1bd960b9c08610b47b7aa
parent f2ec90f26ca29f3fe1237f8b593a0f2d6f25de80
author John Spurlock <jspurlock@google.com> 1381165812 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381165812 -0700

am f2ec90f2: am 2788712a: Merge "Update qs asset outlines." into klp-dev

* commit 'f2ec90f26ca29f3fe1237f8b593a0f2d6f25de80':
  Update qs asset outlines.