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)
commitef32d8cf92950cf5ae8c422f10365904e91fca65
treeba621f85d805040f1b683751bf5e40a61974f386
parentbfd2794b6802a1ab9b5fd4b6b8559022b2dd1cac
parent8311d57e203a2ba7fa2b678e9501ddca1e0d620f
resolved conflicts for merge of 8311d57e to lmp-dev-plus-aosp

Change-Id: I8e238cab09fc3a11871a7e7111b08a501664558d