tree 591e19de5171e4b3112044723f42ed4791e61909
parent 26b2b632cd9fce7e3b2cfcb069e3fe72544f543b
parent a9aecc0c29ce9b9692b9b317559f83b2520dcc43
author Tim Kilbourn <tkilbourn@google.com> 1414204516 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414204516 +0000

am a9aecc0c: Merge "aapt updates for Android TV" into lmp-mr1-dev automerge: 6af7d76 automerge: 181c18e

* commit 'a9aecc0c29ce9b9692b9b317559f83b2520dcc43':
  aapt updates for Android TV