OSDN Git Service

resolve merge conflicts of f606637 to mnc-dev
authorAjay Panicker <apanicke@google.com>
Tue, 6 Dec 2016 03:23:49 +0000 (19:23 -0800)
committerAjay Panicker <apanicke@google.com>
Tue, 6 Dec 2016 03:23:49 +0000 (19:23 -0800)
commit846c09a4fff10ffb9dd8982735abef1de09a08d8
treeaaf3b7b080674538a9c0dba7899053b7375b7775
parent8305951ccaceec41d9ed1be313e8edaf28c45af2
parentf606637319b506dd21ec9a128d69a7f9ebd06eec
resolve merge conflicts of f606637 to mnc-dev

Change-Id: I2e516b0eb36973e097d7837479377a7063b16765
AndroidManifest.xml