OSDN Git Service

Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
authorDaniel Nishi <dhnishi@google.com>
Wed, 9 Aug 2017 22:39:55 +0000 (22:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 22:39:55 +0000 (22:39 +0000)
am: 97e0e42959  -s ours

Change-Id: Id1083efaf83092cf8329fac64b933dfb9e652396


Trivial merge