OSDN Git Service

resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp
authorBart Sears <bsears@google.com>
Fri, 27 Mar 2015 01:03:17 +0000 (18:03 -0700)
committerBart Sears <bsears@google.com>
Fri, 27 Mar 2015 01:03:17 +0000 (18:03 -0700)
commitc3868ae37130a6c1c1a650d78bc26f394439d796
tree4b39d60b44bd57c6df77cb5bd786ff50a95aea7b
parent1c10f0757294d5d46c2e4d8b17da230715897ba6
parent6d607ee7b0983c5a96895e39c292c2f0e957af29
resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp

Change-Id: I0a49bf5492cd5c1b03cf8cddd219db326d586909
CleanSpec.mk