OSDN Git Service

resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp
authorBrian Carlstrom <bdc@google.com>
Wed, 30 Jul 2014 16:53:12 +0000 (09:53 -0700)
committerBrian Carlstrom <bdc@google.com>
Wed, 30 Jul 2014 16:53:12 +0000 (09:53 -0700)
commit4a5a11e416425689d9f37a1963ae852051b451d2
tree717eecd5acdbdf3fa8f15ac5a2dcecc853be7276
parent1dd586eea2ef7fb14cf212dea327b2f344877363
parenta8138028470048fadb0ecd97c58c83a045875943
resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp

Change-Id: I5573d097d741f4922b791b33de5c941af08127c6
tools/post_process_props.py