refs/heads/pie-dev - platform/packages/apps/Messaging

commit: dc683fa0fdf495a717e36ccc40bbe22265b6787f
[log]
author: Atanas Kirilov <akirilov@google.com>
Fri Jun 01 03:47:45 2018 -0700
committer: android-build-merger <android-build-merger@google.com>
Fri Jun 01 03:47:45 2018 -0700
tree: 9425a1489474d58eb378b833a71fe2f9fc104865
parent: a3a85140b6ba6f4a285fe4afba2b8f5bdecae874 [diff]
parent: 8f2f5671b07933e3a2d48abf0ac1954e3ae934a9 [diff]

Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87 am: 24fba8cf55
am: 8f2f5671b0

Change-Id: If409352ed52e8b4a1bf92b2bceedf5f032e8a7ed

tree: 9425a1489474d58eb378b833a71fe2f9fc104865

assets/
build/
jni/
res/
src/
tests/
tools/
Android.mk
AndroidManifest.xml
ForceProguard.mk
proguard-release.flags
proguard-test.flags
proguard.flags
version.mk