tree 765d78f8c0f8eed9883959e22398b4088039477a
parent da9297f09aa1a339a529c0a83990e77964de4631
parent 9fa69108e5fadefb8a97db63ccfd42ef3ac9552c
author Anton Hansson <hansson@google.com> 1519410918 +0000
committer android-build-merger <android-build-merger@google.com> 1519410918 +0000

Merge "packages/apps/BasicSmsReceiver: Set LOCAL_SDK_VERSION where possible." am: 1de7ec51f2 am: 471e5acdad
am: 9fa69108e5

Change-Id: I86fd07718e88387d914eca0177f5ab8b824a168f