OSDN Git Service

Merge \"Merge \\"Include new constant for encryption status in the getter\\'s javadoc...
authorAmith Yamasani <yamasani@google.com>
Tue, 12 Jul 2016 17:55:05 +0000 (17:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 17:55:05 +0000 (17:55 +0000)
commitb493ce833bec354d41be4dd78f0d526cde3b755c
tree5cf950d38f256cf1fa8d28c77bd9ed70ba17d788
parentce8337a804f6de8ac24ed113e534fad310c9f70d
parentd2e6a62838955e883f0ed43e172a0a5fc510e624
Merge \"Merge \\"Include new constant for encryption status in the getter\\'s javadoc\\" into nyc-dev am: e278cf7665\" into nyc-mr1-dev
am: d2e6a62838

Change-Id: I5d11b5f95bab3f5b581f0fab176efc5c349adb55