OSDN Git Service

resolved conflicts for merge of 37878b1e to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Wed, 12 Nov 2014 00:08:29 +0000 (16:08 -0800)
committerDmitriy Ivanov <dimitry@google.com>
Wed, 12 Nov 2014 00:08:29 +0000 (16:08 -0800)
commit741625a17e80bc0ad8e728ba73536386efb1fb4d
tree0b9740e3cfcd40930950d6e3d07ba81b9dd07b28
parent32dc54a1c9a717ee5a7ebdf417bfeafa115c9c59
parent37878b1e57ee25629f0d9aff5edf599afcc8c6eb
resolved conflicts for merge of 37878b1e to lmp-mr1-dev-plus-aosp

Change-Id: I748a7d2fb43fd63189f4688edbd0991e2b609dba
cmds/installd/commands.c
cmds/installd/installd.c