OSDN Git Service

resolved conflicts for merge of 01632399 to lmp-dev-plus-aosp
authorDan Albert <danalbert@google.com>
Mon, 11 Aug 2014 17:58:46 +0000 (10:58 -0700)
committerDan Albert <danalbert@google.com>
Mon, 11 Aug 2014 17:58:46 +0000 (10:58 -0700)
Change-Id: I7744ba85e1964926532f4327ffbc8dcef3c85891


Trivial merge