OSDN Git Service

resolved conflicts for merge of 901d792c to mnc-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Mon, 11 May 2015 18:29:43 +0000 (11:29 -0700)
committerNick Kralevich <nnk@google.com>
Mon, 11 May 2015 18:29:43 +0000 (11:29 -0700)
Change-Id: I63fbc397ba28c832857bf7e27e8f1798e789a6e1


Trivial merge