OSDN Git Service

Merge "resolved conflicts for merge of dce94165 to klp-dev-plus-aosp" into klp-dev...
authorElliott Hughes <enh@google.com>
Fri, 9 Aug 2013 01:05:48 +0000 (01:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Aug 2013 01:05:49 +0000 (01:05 +0000)

Trivial merge