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)
commit2151d69764218a37a66bb5755c74316ffe9e75e0
treede7e3d6a1c26c761ccaac5cd58a77755400a2d31
parent005748ba21ab3f806904d71c5debba053a2cd67e
parentb2da45dd09bec96f43618dccf8c9db11beb7626c
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959
am: b2da45dd09  -s ours

Change-Id: Ic8d931d7ca59e69d168b0ca787dfbf8643899eea