tree 7647f09b0643415cf38c2357f5989d75d3585921
parent 785eb6039b8b161c36bfa1e6add1cd1cd7975208
parent 889c0880661bda16e3759995e03766ddf0350732
author Makoto Onuki <omakoto@google.com> 1456352406 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456352408 +0000

Merge "Support safe mode properly." into nyc-dev