OSDN Git Service

resolve merge conflicts of f606637 to mnc-dev am: 846c09a4ff
authorAjay Panicker <apanicke@google.com>
Tue, 6 Dec 2016 17:45:20 +0000 (17:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 17:45:20 +0000 (17:45 +0000)
commit48f76289448eadf44c1d957e7f5f65f50a0382e3
tree198b3634889b3d4e56bee52ecba9f956d826ed68
parent1bd3e02a8ad8483fa0e8db5865d762fa418ab948
parent8b498077cec8b24b3c33d297e94f012ea63c245b
resolve merge conflicts of f606637 to mnc-dev am: 846c09a4ff
am: 8b498077ce

Change-Id: I44ffb224cf88bd92ec7a590bc3f0d327050e5109