commit | cc37d52de89b008fc385bfffa3d04b23f4392041 | [log] [tgz] |
---|---|---|
author | Shawn Willden <swillden@google.com> | Thu Aug 27 12:17:32 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:17:32 2015 +0000 |
tree | 05cbf3106bfecaa475bd48ba1fd0bedf3743bc09 | |
parent | a10e94869dcb155789eba801100dec61935b0b38 [diff] | |
parent | 24df5e76d0218f1b334da3d12d2054db83303757 [diff] |
am 24df5e76: (-s ours) am 5cf45028: Make NONE mean NONE only (not ANY) * commit '24df5e76d0218f1b334da3d12d2054db83303757':