OSDN Git Service

resolved conflicts for merge of d18f4b25 to lmp-mr1-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Tue, 4 Nov 2014 02:31:10 +0000 (18:31 -0800)
committerElliott Hughes <enh@google.com>
Tue, 4 Nov 2014 02:31:10 +0000 (18:31 -0800)
commit6bb5579b8e8194a54354a88b2d685740c30fc3b9
tree942cdab99c5fa2cbd0dbd03d14bb6220a7a12bd6
parenta0ba3c83edd975159913aacc992f3f9400e332f5
parentd18f4b25785761c022906b93b2123b3be90182e8
resolved conflicts for merge of d18f4b25 to lmp-mr1-dev-plus-aosp

Change-Id: Ie1ebacd432a61d680bb1325aa369db717d39299d