tree 6c5d753d15582aacaaa59cbd95a22ab8f128b8f6
parent a2dad41e757b8de097491aedecca80387ba3af09
parent ea18624ae557a06e49748964f951a81fd6c48370
author Craig Mautner <cmautner@google.com> 1383780623 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383780623 -0800

am ea18624a: am c9d0ee5e: Merge "Tweak test for layout." into klp-dev

* commit 'ea18624ae557a06e49748964f951a81fd6c48370':
  Tweak test for layout.