tree f68ba5433dd3e4176ad7ac887169cad75d32b3c1
parent 5d2bd6bf0cb9f20dfa92e56d4eeeea530b6565b2
parent 6fb084db88dde09929185e6becd07410d7beb0d0
author Chih-hung Hsieh <chh@google.com> 1512530711 +0000
committer android-build-merger <android-build-merger@google.com> 1512530711 +0000

Merge "Use -Werror in frameworks/base/tests/backup" am: d5dca64f72
am: 6fb084db88

Change-Id: I6d18cc00937896bb227fc1ba30bc6102f84029b3