OSDN Git Service

Merge "Merge \\"Include new constant for encryption status in the getter\\'s javadoc...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 12 Jul 2016 17:57:52 +0000 (17:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 Jul 2016 17:57:53 +0000 (17:57 +0000)
commitb2ec84bb48f8e739f303de1edcb746ca6baa0656
tree5cf950d38f256cf1fa8d28c77bd9ed70ba17d788
parentb493ce833bec354d41be4dd78f0d526cde3b755c
parentecce1ffdef0f1583d36a781f917b4c9958f2bfd7
Merge "Merge \\"Include new constant for encryption status in the getter\\'s javadoc\\" into nyc-dev am: e278cf7665 am: c6b85035b4" into nyc-mr1-dev-plus-aosp