tree 407911c79e3404ca2d79487a01b0e59d54a483de
parent 65d577139c8093f2a601069bbe05d2e622e0d340
parent 2788712abb3b35cdaed253a2c221b2dd791e95af
author John Spurlock <jspurlock@google.com> 1381165636 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381165636 -0700

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

* commit '2788712abb3b35cdaed253a2c221b2dd791e95af':
  Update qs asset outlines.