OSDN Git Service

resolved conflicts for merge of 73a93774 to mnc-dev-plus-aosp
authorJeff Hao <jeffhao@google.com>
Mon, 1 Jun 2015 16:58:07 +0000 (09:58 -0700)
committerJeff Hao <jeffhao@google.com>
Mon, 1 Jun 2015 16:58:07 +0000 (09:58 -0700)
Change-Id: I67697bbcab762006fc9c7eed17d06c7e02b0a4a2


Trivial merge