tree cf4cae1a7bbea1e36d0e6cac12ec179af497bd09
parent 072923238d277bb24ffc82073d3e11d13a4de2fa
parent d19aa4bae2161f89966e38cb099f2f080e2bbfac
author Dirk Dougherty <ddougherty@google.com> 1399071825 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399071825 +0000

am d19aa4ba: am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.

* commit 'd19aa4bae2161f89966e38cb099f2f080e2bbfac':
  Merge changes from templates-sdk to templates-sdk-dyn.