tree ba468d62eec515df41aafe4c9be85dbb443d6214
parent e86ab5e1d34beb6706589f0ce316c0cfa0053ee4
parent a20f625cc1006b03d4a2be90ba35d1a9783ad363
author Jeff Brown <jeffbrown@google.com> 1384361933 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384361933 -0800

am a20f625c: am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev

* commit 'a20f625cc1006b03d4a2be90ba35d1a9783ad363':
  Finalize assets for screen casting.