OSDN Git Service

Merge all of templates-sdk-dev into templates-sdk. I actually just deleted templates...
authorsmain@google.com <smain@google.com>
Wed, 31 Aug 2016 22:13:34 +0000 (22:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 Aug 2016 22:13:34 +0000 (22:13 +0000)
am: 4f3a05a2c6

Change-Id: I11564954529ed7a1cd1098c66b052190f3d3d6f6


Trivial merge