OSDN Git Service

Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959
authorDaniel Nishi <dhnishi@google.com>
Thu, 10 Aug 2017 00:08:13 +0000 (00:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Aug 2017 00:08:13 +0000 (00:08 +0000)
am: b2da45dd09  -s ours

Change-Id: Ic8d931d7ca59e69d168b0ca787dfbf8643899eea


Trivial merge