OSDN Git Service

resolved conflicts for merge of 40f2f751 to jb-mr1-dev-plus-aosp
authorKenny Root <kroot@google.com>
Wed, 17 Oct 2012 17:50:14 +0000 (10:50 -0700)
committerKenny Root <kroot@google.com>
Wed, 17 Oct 2012 17:50:14 +0000 (10:50 -0700)
commit367400491a22cefd4e366e2278caf63d574820b0
tree683fd4f160028134b2d92b93df6da5485bb98954
parentae232842c86f108da5a73c047eff5a09e9c9c222
parent40f2f751ac7cebc455b44da23b9589cca5ae2e25
resolved conflicts for merge of 40f2f751 to jb-mr1-dev-plus-aosp

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