OSDN Git Service

am 969c4c0c: am b6b3da3c: am a4d2d0ef: s.a.c templates
authorRobert Ly <robertly@google.com>
Tue, 9 Apr 2013 20:37:01 +0000 (13:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Apr 2013 20:37:01 +0000 (13:37 -0700)
* commit '969c4c0c3c0d24d00bb27606de477f4c0cfc24fc':
  s.a.c templates


Trivial merge