OSDN Git Service

resolve merge conflicts of 1ccaed4 to nyc-dev-plus-aosp
authorDan Austin <danielaustin@google.com>
Mon, 28 Mar 2016 22:09:02 +0000 (15:09 -0700)
committerDan Austin <danielaustin@google.com>
Mon, 28 Mar 2016 22:09:02 +0000 (15:09 -0700)
commit632350257cd93e34aa1e8b354c1535864b314c38
treeb06b11c778bed6a8cbcfb119086a9be82aef084a
parent880e74ef01fea3def5a5c9b53784bba55e6f7ec0
parent1ccaed4d2ba9af76bb30b286880dba687e36dbdc
resolve merge conflicts of 1ccaed4 to nyc-dev-plus-aosp

Change-Id: Ib30c59ff496ed76ec46f4c8f7d954d571bcbf4ae
cmds/installd/commands.cpp
cmds/installd/installd.cpp