OSDN Git Service

Merge "Better named encryption flags, start triaging."
authorJeff Sharkey <jsharkey@google.com>
Sat, 19 Dec 2015 22:04:48 +0000 (22:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 19 Dec 2015 22:04:48 +0000 (22:04 +0000)

Trivial merge