OSDN Git Service

Merge "A patch against your current ToT that builds in AOSP master."
authorElliott Hughes <enh@google.com>
Sun, 23 Nov 2014 06:39:19 +0000 (06:39 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Sun, 23 Nov 2014 06:39:19 +0000 (06:39 +0000)

Trivial merge