OSDN Git Service

resolve merge conflicts of f606637 to mnc-dev
authorAjay Panicker <apanicke@google.com>
Tue, 6 Dec 2016 17:41:20 +0000 (17:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 17:41:20 +0000 (17:41 +0000)
commit8b498077cec8b24b3c33d297e94f012ea63c245b
tree0b056e732cd7b1c9e088c1d2e2395aed488311af
parent8eb38035db429d8ef66046209f3e325bb1f1d875
parent846c09a4fff10ffb9dd8982735abef1de09a08d8
resolve merge conflicts of f606637 to mnc-dev
am: 846c09a4ff

Change-Id: Idf327a36530c6ead418310e25d9e4944687aa807
AndroidManifest.xml