OSDN Git Service

am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates...
authorDirk Dougherty <ddougherty@google.com>
Fri, 2 May 2014 22:58:02 +0000 (22:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 May 2014 22:58:02 +0000 (22:58 +0000)
* commit '611d7e14e87d030cd5d89b932a1877289ab68e8d':
  Merge changes from templates-sdk to templates-sdk-dyn.


Trivial merge