OSDN Git Service

Merge "resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp" into lmp-dev...
authorChristopher Ferris <cferris@google.com>
Mon, 6 Oct 2014 23:32:52 +0000 (23:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 6 Oct 2014 23:32:53 +0000 (23:32 +0000)

Trivial merge