OSDN Git Service

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


Trivial merge